[system-config-httpd] - Fedora package review finished, final build (#226457)

[Phil Knirsch]

commit 99c81a476734422013fa458bda21e6d48b892950
Author: Phil Knirsch <pknirsch at redhat.com>
Date:   Wed Aug 18 19:38:46 2010 +0200

    - Fedora package review finished, final build (#226457)

 .gitignore               |    1 +
 sources                  |    2 +-
 system-config-httpd.spec |   66 ++++++++++++++++++++++++++-------------------
 3 files changed, 40 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e01f8c..aaf0cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 system-config-httpd-1.5.2.tar.gz
+/system-config-httpd-1.5.5.tar.gz
diff --git a/sources b/sources
index 10b0f2b..4c65a9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8436854bf4de768b9fde9e79edb6ceab  system-config-httpd-1.5.2.tar.gz
+77be1c910e552724960bd252a486356d  system-config-httpd-1.5.5.tar.gz
diff --git a/system-config-httpd.spec b/system-config-httpd.spec
index 5727077..f162576 100644
--- a/system-config-httpd.spec
+++ b/system-config-httpd.spec
@@ -1,22 +1,25 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
-Version: 1.5.2
-Release: 2%{?dist}
+Version: 1.5.5
+Release: 1%{?dist}
 Epoch: 5
-URL: http://www.redhat.com/
+URL: http://hg.fedorahosted.org/hg/system-config-httpd
+# No release tarballs typically available. To recreate your own tarball for a specific release follow these
+# steps:
+# 1) hg clone http://hg.fedorahosted.org/hg/system-config-httpd
+# 2) cd system-config-httpd
+# 3) hg tags
+# 4) Select the release you want to create a tarball for, in this example system-config-httpd-1_4_0-1
+# 2) hg checkout system-config-httpd-1_4_0-1
+# 3) ./autogen.sh
+# 4) make dist
+# Afterwards you should have a tarball called system-config-http-1.4.0.tar.gz in the working directory
 Source0: system-config-httpd-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python >= 2.2, python-devel >= 2.2
-BuildRequires: libglade2-devel, gettext, intltool >= 0.17
+BuildRequires: python2-devel, libglade2-devel, gettext, intltool
 BuildArch: noarch
-Requires: python >= 2.2, libglade2, pygtk2-libglade, pygtk2
-Requires: gnome-python2, gnome-python2-canvas, gnome-python2-gnome, httpd, usermode, libxslt-python
-Obsoletes: apacheconf
-Provides: apacheconf
-Obsoletes: redhat-config-httpd
-Provides: redhat-config-httpd
+Requires: pygtk2-libglade, gnome-python2-canvas, gnome-python2-gnome, httpd, usermode, python-lxml
 
 %description
 system-config-httpd is a graphical user interface that allows the user to
@@ -31,19 +34,10 @@ configure a httpd server.
 %undefine       _target_platform
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 %find_lang system-config-httpd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-if [ -h /etc/pam.d/system-config-httpd ] ; then
-  mv -f /etc/pam.d/system-config-httpd /etc/pam.d/system-config-httpd.rpmsave
-fi
-
 %preun
 if [ $1 = 0 ]; then
   if [ -d /var/cache/alchemist/apache ] ; then
@@ -51,7 +45,6 @@ if [ $1 = 0 ]; then
   fi
 
   if [ -d /usr/share/system-config-httpd ] ; then
-    rm -rf /usr/share/system-config-httpd/*.pyc
     rm -rf /usr/share/system-config-httpd/*.md5
   fi
 fi
@@ -62,20 +55,37 @@ fi
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
-%config(noreplace) %{_sysconfdir}/alchemist/switchboard/
+# This file is not supposed to be read by users, only root, so 0600 permission.
+%{_sysconfdir}/alchemist/switchboard/
 %config(noreplace) %{_sysconfdir}/alchemist/namespace/system-config-httpd/local.adl
-%config %{_sysconfdir}/alchemist/namespace/system-config-httpd/rpm.adl
+# This file is not supposed to be read by users, only root, so 0600 permission.
+%{_sysconfdir}/alchemist/namespace/system-config-httpd/rpm.adl
 %dir %{_sysconfdir}/alchemist/namespace/system-config-httpd
 %{_mandir}/man1/*
 %{_datadir}/system-config-httpd
 %{_datadir}/pixmaps/system-config-httpd.png
-%{_datadir}/kontrol-panel
 %{_datadir}/applications/*
+%{_datadir}/kontrol-panel/*
 %dir /var/cache/alchemist/apache
 
 %changelog
-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 5:1.5.2-2
-- recompiling .py files against Python 2.7 (rhbz#623399)
+* Wed Aug 18 2010 Phil Knirsch <pknirsch at redhat.com> 1.5.5-1
+- Pulled in latest sv language updates before build
+- Had to re-add the {_datadir}/kontrol-panel/* due to the KDE desktop file
+
+* Fri Aug 06 2010 Phil Knirsch <pknirsch at redhat.com>
+- Final fixes for review (#226457)
+
+* Thu Aug 05 2010 Phil Knirsch <pknirsch at redhat.com> 1.5.4-1
+- More fixes for the review (#226457)
+
+* Wed Aug 04 2010 Phil Knirsch <pknirsch at redhat.com> 1.5.3-1
+- Fixed the config(noreplace) issues (#226457)
+- Switched XSLT processor from libxslt-python to python-lxml
+- Fixed URL as hg.fedoraproject.org doesn't exist anymore
+
+* Fri Jul 23 2010 Phil Knirsch <pknirsch at redhat.com>
+- Fedora package review first fixes (#226457)
 
 * Thu May 20 2010 Phil Knirsch <pknirsch at redhat.com> 1.5.2-1
 - Modified console file to replace USER=root with config-util inclusion (#428400)