diff --git a/packaging_scripts/alien.sh b/packaging_scripts/alien.sh index 4a22131..8557093 100755 --- a/packaging_scripts/alien.sh +++ b/packaging_scripts/alien.sh @@ -10,7 +10,7 @@ cd ${BASEDIR} sudo rpm --import ${BASEDIR}/repo/PUBLIC.KEY # Convert deb to rpm -sudo alien -g -r ${BASEDIR}/gmnd_${VERSION}_all.deb +sudo alien --scripts -g -r ${BASEDIR}/gmnd_${VERSION}_all.deb # Remove generated specfile sudo rm ${BASEDIR}/gmnd-${VERSION}/gmnd-*.spec diff --git a/packaging_scripts/reprepro.sh b/packaging_scripts/reprepro.sh index 6e72672..21d2f59 100755 --- a/packaging_scripts/reprepro.sh +++ b/packaging_scripts/reprepro.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash # Where I keep the sources -BASEDIR=~/sources/gmnd +BASEDIR=~/sources # Version of gmnd -VERSION=$(awk '/.*SERVER_SOFTWARE/ {print $4}' ${BASEDIR}/gmnd/__init__.py|sed "s/'//" ) +VERSION=$(awk '/.*SERVER_SOFTWARE/ {print $4}' ${BASEDIR}/gmnd/gmnd/__init__.py|sed "s/'//" ) # Change to source dir -cd ${BASEDIR} +cd ${BASEDIR}/gmnd # Build deb dpkg-buildpackage -us -uc # Add binary and source to repo -reprepro --basedir ${BASEDIR}/debian includedeb unstable ${BASEDIR}/gmnd_${VERSION}_all.deb -reprepro --basedir ${BASEDIR}/debian -S net --priority optional includedsc unstable ${BASEDIR}/gmnd_${VERSION}.dsc +reprepro --basedir ${BASEDIR}/repo/debian includedeb unstable ${BASEDIR}/gmnd_${VERSION}_all.deb +reprepro --basedir ${BASEDIR}/repo/debian -S net --priority optional includedsc unstable ${BASEDIR}/gmnd_${VERSION}.dsc diff --git a/rpm/gmnd-TEMPLATE.spec b/rpm/gmnd-TEMPLATE.spec index 859471e..95fb556 100644 --- a/rpm/gmnd-TEMPLATE.spec +++ b/rpm/gmnd-TEMPLATE.spec @@ -18,7 +18,7 @@ static files, or run cgi-scripts. Documentation will primarily be supplied via gemini://mic.ke/gmnd/docs %files -%docdir usr/share/doc/gmnd +%docdir /usr/share/doc/gmnd "/usr/share/doc/gmnd/changelog.gz" "/usr/share/doc/gmnd/copyright" %config "/etc/gmnd/config.yml"