From be8eb07afd724cb02e8b41d855c6aab160d6fd95 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 10 Oct 2010 18:16:02 +0000
Subject: [PATCH] - synx with fc, simplify

Changed files:
    func.spec -> 1.11
---
 func.spec | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/func.spec b/func.spec
index 737a2bb..8c2716d 100644
--- a/func.spec
+++ b/func.spec
@@ -9,11 +9,12 @@ Source0:	http://people.fedoraproject.org/~alikins/files/func/%{name}-%{version}.
 # Source0-md5:	892252004f122c61bb58bb4607553ffe
 Source1:	%{name}-funcd.init
 Patch0:		%{name}-setup.patch
-URL:		https://hosted.fedoraproject.org/func/
+URL:		https://fedorahosted.org/func/
 BuildRequires:	python
 BuildRequires:	rpmbuild(macros) >= 1.219
 Requires:	certmaster >= 0.25
 Requires:	python-pyOpenSSL
+Requires:	python-simplejson
 %pyrequires_eq	python-libs
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,8 +24,8 @@ FUNC (Fedora Unified Network Controller) is a remote API for
 management, configation, and monitoring of systems.
 
 %description -l pl.UTF-8
-FUNC (Fedora Unified Network Controller) to zdalne API do
-zarządzania, konfiguracji i monitorowania systemów.
+FUNC (Fedora Unified Network Controller) to zdalne API do zarządzania,
+konfiguracji i monitorowania systemów.
 
 %prep
 %setup -q
@@ -39,10 +40,11 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log/func}
 %{__python} setup.py install \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/funcd
 
 %py_postclean
 
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/funcd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,20 +70,15 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/func_rotate
 %attr(754,root,root) /etc/rc.d/init.d/funcd
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/func/minion.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/func/overlord.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/func/async_methods.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/func/modules/*
-%{py_sitescriptdir}/*.egg-info
-%{py_sitescriptdir}/func/*.py[co]
-%{py_sitescriptdir}/func/minion/*.py[co]
-%{py_sitescriptdir}/func/minion/modules/*.py[co]
-%{py_sitescriptdir}/func/minion/modules/iptables/*.py[co]
-%{py_sitescriptdir}/func/minion/modules/netapp/*.py[co]
-%{py_sitescriptdir}/func/minion/modules/netapp/vol/*.py[co]
-%{py_sitescriptdir}/func/overlord/*.py[co]
-%{py_sitescriptdir}/func/overlord/cmd_modules/*.py[co]
-%{py_sitescriptdir}/func/overlord/modules/*.py[co]
-%{py_sitescriptdir}/func/yaml/*.py[co]
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/async_methods.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/minion.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/overlord.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/modules/Bridge.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/modules/Test.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/modules/Vlan.conf
 %{_mandir}/man1/*.1*
+%{py_sitescriptdir}/func
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/func-*.egg-info
+%endif
 %dir /var/log/func
-- 
2.43.0