diff --git a/.gitattributes b/.gitattributes index 8f5be96..4f6600f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,4 +23,3 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns 60C5442D.key filter=lfs diff=lfs merge=lfs -text -Apache.xpm filter=lfs diff=lfs merge=lfs -text diff --git a/Apache.xpm b/Apache.xpm deleted file mode 100644 index 7c0bce1..0000000 --- a/Apache.xpm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:995d4deb92a87593dff872345780ca183d734af6d4d2af439827377adfc74d41 -size 9044 diff --git a/apache2.changes b/apache2.changes index 29c01a2..b4d4eab 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 25 18:03:20 UTC 2015 - tchvatal@suse.com + +- Exit cleanly on end of the post and cleanup the update detection +- Remove Apache.xpm as it ain't used + ------------------------------------------------------------------- Wed Feb 25 15:59:26 UTC 2015 - tchvatal@suse.com diff --git a/apache2.spec b/apache2.spec index ab9e97d..2e73332 100644 --- a/apache2.spec +++ b/apache2.spec @@ -1275,8 +1275,7 @@ fi %else %{fillup_and_insserv apache2} %endif -# Update ? -if [ $1 -gt 1 ]; then +if [ $1 -gt 1 ] ; then # update from package with the old near-monolithic conf file? if [ -s ./%{sysconfdir}/httpd.conf.default -a -s ./%{sysconfdir}/httpd.conf.rpmnew ]; then diff -u .%{sysconfdir}/httpd.conf.default .%{sysconfdir}/httpd.conf \ @@ -1301,6 +1300,7 @@ if [ $1 -gt 1 ]; then chown --reference=./%{sysconfdir}/httpd.conf $tmpfile cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf fi +exit 0 rm -rf $tmpdir %{_datadir}/%{pname}/apache-20-22-upgrade