rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

- Exit cleanly on end of the post and cleanup the update detection

Browse Source 
- Remove Apache.xpm as it ain't used

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=436
This commit is contained in:
Tomáš Chvátal 2015-02-25 18:03:53 +00:00 committed by Git OBS Bridge
parent 8b05757aa0
commit 21519bff71
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -23,4 +23,3 @@
*.zst filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns ## Specific LFS patterns
60C5442D.key filter=lfs diff=lfs merge=lfs -text 60C5442D.key filter=lfs diff=lfs merge=lfs -text
Apache.xpm filter=lfs diff=lfs merge=lfs -text

3
Apache.xpm
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:995d4deb92a87593dff872345780ca183d734af6d4d2af439827377adfc74d41
size 9044

6
apache2.changes
View File

@ -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 Wed Feb 25 15:59:26 UTC 2015 - tchvatal@suse.com

4
apache2.spec
View File

@ -1275,8 +1275,7 @@ fi
%else %else
%{fillup_and_insserv apache2} %{fillup_and_insserv apache2}
%endif %endif
# Update ? if [ $1 -gt 1 ] ; then
if [ $1 -gt 1 ]; then
# update from package with the old near-monolithic conf file? # update from package with the old near-monolithic conf file?
if [ -s ./%{sysconfdir}/httpd.conf.default -a -s ./%{sysconfdir}/httpd.conf.rpmnew ]; then if [ -s ./%{sysconfdir}/httpd.conf.default -a -s ./%{sysconfdir}/httpd.conf.rpmnew ]; then
diff -u .%{sysconfdir}/httpd.conf.default .%{sysconfdir}/httpd.conf \ diff -u .%{sysconfdir}/httpd.conf.default .%{sysconfdir}/httpd.conf \
@ -1301,6 +1300,7 @@ if [ $1 -gt 1 ]; then
chown --reference=./%{sysconfdir}/httpd.conf $tmpfile chown --reference=./%{sysconfdir}/httpd.conf $tmpfile
cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf
fi fi
exit 0
rm -rf $tmpdir rm -rf $tmpdir
%{_datadir}/%{pname}/apache-20-22-upgrade %{_datadir}/%{pname}/apache-20-22-upgrade