rpms/func/EL-5 .cvsignore, 1.10, 1.11 func.spec, 1.9, 1.10 sources, 1.10, 1.11
Adrian Likins
alikins at fedoraproject.org
Wed Aug 12 20:35:23 UTC 2009
Author: alikins
Update of /cvs/pkgs/rpms/func/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16561
Modified Files:
.cvsignore func.spec sources
Log Message:
func-0.25-2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 17 Dec 2008 21:51:48 -0000 1.10
+++ .cvsignore 12 Aug 2009 20:35:23 -0000 1.11
@@ -7,3 +7,4 @@ func-0.20.tar.gz
func-0.21.tar.gz
func-0.23.tar.gz
func-0.24.tar.gz
+func-0.25.tar.gz
Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- func.spec 17 Dec 2008 21:51:48 -0000 1.9
+++ func.spec 12 Aug 2009 20:35:23 -0000 1.10
@@ -1,31 +1,43 @@
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
Summary: Remote management framework
Name: func
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25
+Release: 2%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
Requires: python >= 2.3
Requires: pyOpenSSL
-Requires: python-simplejson
-Requires: certmaster >= 0.24
+%endif
+Requires: %{python}-simplejson
+Requires: certmaster >= %{version}
Requires: logrotate
-BuildRequires: python-devel
+BuildRequires: %{python}-devel
%if %is_suse
BuildRequires: gettext-devel
%else
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
+%if 0%{?rhel} >= 5
BuildRequires: python-setuptools
%endif
%endif
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: https://fedorahosted.org/func/
@@ -35,6 +47,9 @@ func is a remote api for mangement, conf
%prep
%setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
%build
%{__python} setup.py build
@@ -42,13 +57,15 @@ func is a remote api for mangement, conf
%install
test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/log/func/func.log
+touch $RPM_BUILD_ROOT/var/log/func/audit.log
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
%{python_sitelib}/func*.egg-info
%endif
%{_bindir}/funcd
@@ -64,8 +81,11 @@ rm -fr $RPM_BUILD_ROOT
%dir /etc/func/modules/
%config(noreplace) /etc/func/minion.conf
%config(noreplace) /etc/func/async_methods.conf
+%config(noreplace) /etc/func/overlord.conf
%config(noreplace) /etc/logrotate.d/func_rotate
%config(noreplace) /etc/func/modules/Test.conf
+%config(noreplace) /etc/func/modules/Bridge.conf
+%config(noreplace) /etc/func/modules/Vlan.conf
%dir %{python_sitelib}/func
%dir %{python_sitelib}/func/minion
%dir %{python_sitelib}/func/overlord
@@ -90,13 +110,20 @@ rm -fr $RPM_BUILD_ROOT
%{python_sitelib}/func/minion/modules/*/*/*.py*
%dir /var/log/func
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/func.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/audit.log
+
%dir /var/lib/func
-%doc AUTHORS README LICENSE
+
+#%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+
+%doc AUTHORS README LICENSE CHANGES
%{_mandir}/man1/func.1.gz
%{_mandir}/man1/func-inventory.1.gz
%{_mandir}/man1/funcd.1.gz
%{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
%post
# for suse
@@ -114,7 +141,9 @@ else
ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/k01funcd
done
fi
-
+# fix perms on log files
+chmod 600 /var/log/func/func.log
+chmod 600 /var/log/func/audit.log
# upgrade old installs if needed
#/usr/bin/update-func
@@ -135,6 +164,36 @@ fi
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add CHANGES to spec file
+
+* Wed May 27 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/log/func/*.log files to spec
+- add a post section to chmod any log files with bogus perms
+
+
+* Thu Apr 16 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- add an overlord.conf file
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+ do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
* Wed Dec 17 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
- require certmaster 0.24
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 17 Dec 2008 21:51:48 -0000 1.10
+++ sources 12 Aug 2009 20:35:23 -0000 1.11
@@ -5,3 +5,4 @@ def199858286218daef908e871f2e7ca func-0
715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz
821f5ba123d7fe2e98aa51b8f00a17c2 func-0.23.tar.gz
36b8a5190c0d6f12973ebdfb02f63652 func-0.24.tar.gz
+892252004f122c61bb58bb4607553ffe func-0.25.tar.gz
More information about the fedora-extras-commits
mailing list