moceap pushed to system-config-httpd (f20). "New Revision and Icon addition"

Wed Mar 25 04:52:09 UTC 2015

>From acd17447cfe5551b0d4af850ffb1b843debfb6c7 Mon Sep 17 00:00:00 2001
From: Mosaab Alzoubi <moceap at hotmail.com>
Date: Wed, 25 Mar 2015 07:44:58 +0300
Subject: New Revision and Icon addition

diff --git a/.gitignore b/.gitignore
index aaf0cbe..6120d02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 system-config-httpd-1.5.2.tar.gz
 /system-config-httpd-1.5.5.tar.gz
+/system-config-httpd-icons.tar.gz
diff --git a/sources b/sources
index 4c65a9f..55b7067 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+b55134be61d8060fa09e20965fd1ee73  system-config-httpd-icons.tar.gz
 77be1c910e552724960bd252a486356d  system-config-httpd-1.5.5.tar.gz
diff --git a/system-config-httpd.spec b/system-config-httpd.spec
index 9c7a9fd..07f935b 100644
--- a/system-config-httpd.spec
+++ b/system-config-httpd.spec
@@ -1,7 +1,7 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
 Version: 1.5.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 5
 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
@@ -15,11 +15,19 @@ URL: http://hg.fedorahosted.org/hg/system-config-httpd
 # 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
+Source1: system-config-httpd-icons.tar.gz
 License: GPLv2+
-Group: Applications/System
-BuildRequires: python2-devel, libglade2-devel, gettext, intltool
 BuildArch: noarch
-Requires: pygtk2-libglade, gnome-python2-canvas, gnome-python2-gnome, httpd, usermode, python-lxml
+BuildRequires: python2-devel
+BuildRequires: libglade2-devel
+BuildRequires: gettext
+BuildRequires: intltool
+Requires: pygtk2-libglade
+Requires: gnome-python2-canvas
+Requires: gnome-python2-gnome
+Requires: httpd
+Requires: usermode
+Requires: python-lxml
 
 %description
 system-config-httpd is a graphical user interface that allows the user to
@@ -35,8 +43,8 @@ configure a httpd server.
 
 %install
 make DESTDIR=%{buildroot} INSTALL="install -p" install
-
 %find_lang system-config-httpd
+tar -xzvf %{SOURCE1} -C %{buildroot}%{_datadir}
 
 %preun
 if [ $1 = 0 ]; then
@@ -49,8 +57,19 @@ if [ $1 = 0 ]; then
   fi
 fi
 
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f system-config-httpd.lang
-%defattr(-,root,root)
 %doc %{_docdir}/system-config-httpd
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/pam.d/*
@@ -65,10 +84,19 @@ fi
 %{_datadir}/system-config-httpd
 %{_datadir}/pixmaps/system-config-httpd.png
 %{_datadir}/applications/*
+%{_datadir}/icons/*
 %{_datadir}/kontrol-panel/*
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Wed Mar 25 2015 Mosaab Alzoubi <moceap at hotmail.com> - 5:1.5.5-8
+- Add hicolor icons #540270
+- Clean Spec up
+- Remove old tags
+- Split BRs
+- Split Requires
+- Fix dates in %%changelog
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.5.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -121,7 +149,7 @@ fi
 - Renamed sr at Latn.po to sr at latin.po (#426593)
 - Switched to hashlib from md5
 
-* Thu Oct 02 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.5-1
+* Fri Oct 02 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.5-1
 - Lotsa language updates
 - Several fixes from Radek Novacek for the S-c-tools cleanup project:
 - Resolves: #493830,#493841,#493895,#508068
@@ -202,10 +230,10 @@ fi
 - Obsoletes redhat-config-httpd (#124106)
 - system-config-httpd docdir now is owned by package (#125750)
 
-* Tue Mar 04 2004 Karsten Hopp <karsten at redhat.com>
+* Thu Mar 04 2004 Karsten Hopp <karsten at redhat.com>
 - update translations (#118809)
 
-* Tue Mar 04 2004 Karsten Hopp <karsten at redhat.com>
+* Thu Mar 04 2004 Karsten Hopp <karsten at redhat.com>
 - fix console.apps file (#116023)
 
 * Wed Feb 04 2004 Phil Knirsch <pknirsch at redhat.com>
@@ -362,10 +390,10 @@ fi
 - Fixed missing libglade-devel build prereq (#44725)
 - Fixed missing ServerAlias entries in vhosts (#44320)
 
-* Mon Jun 16 2001 Tammy Fox <tfox at redhat.com> 0.8-3/3
+* Sat Jun 16 2001 Tammy Fox <tfox at redhat.com> 0.8-3/3
 - Minor changes to documentation
 
-* Tue May 14 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-3/2
+* Mon May 14 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-3/2
 - Fixed some autofoo issues in Makefile.am, specfile and autogen.sh
 - Fixed Bugzilla bug #40004 (small typo in src/ApacheControl.py)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/system-config-httpd.git/commit/?h=f20&id=acd17447cfe5551b0d4af850ffb1b843debfb6c7

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
