[func] Adding Func v0.30 release
ssalevan
ssalevan at fedoraproject.org
Mon Oct 15 22:43:46 UTC 2012
commit 9e9afcef95069414823133c4bd34923f2294960e
Author: Steve Salevan <steve at tumblr.com>
Date: Mon Oct 15 18:43:22 2012 -0400
Adding Func v0.30 release
.gitignore | 1 +
func.spec | 102 ++++++++++++------------------------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 472dd7f..509180d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ func-0.23.tar.gz
func-0.24.tar.gz
func-0.25.tar.gz
func-0.27.tar.gz
+/func-0.30.tar.gz
diff --git a/func.spec b/func.spec
index 8e7a6db..a817fa1 100644
--- a/func.spec
+++ b/func.spec
@@ -1,9 +1,3 @@
-%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()")}
@@ -11,24 +5,17 @@
Summary: Remote management framework
Name: func
-Version: 0.28
-Release: 4%{?dist}
+Version: 0.30
+Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
-Source1: func.service
License: GPLv2+
Group: Applications/System
-%if 0%{?rhel} == 3
-Requires: %{python}
-Requires: pyOpenSSL-py23
-%else
Requires: python >= 2.3
Requires: pyOpenSSL
-%endif
-Requires: %{python}-simplejson
+Requires: python-simplejson
Requires: certmaster >= 0.28
Requires: logrotate
-Requires: smolt
-BuildRequires: %{python}-devel
+BuildRequires: python-devel
%if %is_suse
BuildRequires: gettext-devel
%else
@@ -40,13 +27,6 @@ BuildRequires: python-setuptools
%endif
%endif
%endif
-%if 0%{?fedora} >= 16
-BuildRequires: systemd-units
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: https://fedorahosted.org/func/
@@ -56,9 +36,6 @@ func is a remote api for mangement, configuration, and monitoring of systems.
%prep
%setup -q
-%if 0%{?rhel} == 3
-%patch0 -p1
-%endif
%build
%{__python} setup.py build
@@ -69,12 +46,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
touch $RPM_BUILD_ROOT/var/log/func/func.log
touch $RPM_BUILD_ROOT/var/log/func/audit.log
-%if 0%{?fedora} >= 16
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/funcd.service
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-%endif
-
%clean
rm -fr $RPM_BUILD_ROOT
@@ -89,7 +60,6 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/func-create-module
%{_bindir}/func-transmit
%{_bindir}/func-build-map
-%{_bindir}/func-group
%{_bindir}/func-command
%{_bindir}/func-down-hosts
%{_bindir}/func-find-user
@@ -98,14 +68,10 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/func-ps-compare
%{_bindir}/func-whatsmyname
%{_bindir}/func-yum
-
+%{_bindir}/func-group
#%{_bindir}/update-func
-%if 0%{?fedora} >= 16
-%{_unitdir}/funcd.service
-%else
/etc/init.d/funcd
-%endif
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/minion-acl.d/
%dir /etc/func/modules/
@@ -163,14 +129,8 @@ rm -fr $RPM_BUILD_ROOT
%{_mandir}/man1/func-create-module.1.gz
%post
-# systemd
-if [ -x /bin/systemctl ]; then
- if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- fi
# for suse
-elif [ -x /usr/lib/lsb/install_initd ]; then
+if [ -x /usr/lib/lsb/install_initd ]; then
/usr/lib/lsb/install_initd /etc/init.d/funcd
# for red hat distros
elif [ -x /sbin/chkconfig ]; then
@@ -195,11 +155,7 @@ exit 0
%preun
if [ "$1" = 0 ] ; then
/etc/init.d/funcd stop > /dev/null 2>&1
- if [ -x /bin/systemctl ]; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable funcd.service > /dev/null 2>&1 || :
- /bin/systemctl stop funcd.service > /dev/null 2>&1 || :
- elif [ -x /usr/lib/lsb/remove_initd ]; then
+ if [ -x /usr/lib/lsb/remove_initd ]; then
/usr/lib/lsb/remove_initd /etc/init.d/funcd
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --del funcd
@@ -208,40 +164,22 @@ if [ "$1" = 0 ] ; then
fi
fi
-%postun
-if [ -x /bin/systemctl ]; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart funcd.service >/dev/null 2>&1 || :
- fi
-fi
-
-%if 0%{?fedora} >= 16
-%triggerun -- func < 0.28-2
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply funcd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save funcd >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del funcd >/dev/null 2>&1 || :
-/bin/systemctl try-restart funcd.service >/dev/null 2>&1 || :
-%endif
%changelog
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 0.28-2
-- convert to systemd
-
-* Thu Apr 7 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.28-1
-- 0.28 - require newer certmaster
+* Mon Oct 15 2012 Steve Salevan <ssalevan at fedoraproject.org> - 0.30-1
+- v0.30 release:
+- Added copyfile improvements
+- Improvements to all func-* scripts
+- Delegation improvements
+- Stability improvements
+- Removing dependency on smolt
+
+* Thu Mar 31 2011 Seth Vidal <skvidal at fedoraproject.org> - 0.28-1
+- 0.28
+
+* Fri Oct 8 2010 Seth Vidal <skvidal at fedoraproject.org> - 0.27-2
+- add func-commands and func-yum
* Wed Aug 25 2010 Seth Vidal <skvidal at fedoraproject.org> - 0.27-1
- bump to 0.27
diff --git a/sources b/sources
index d2e3cc8..d01cbdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-332e35c4bf6ac838df3fa8cf00732172 func-0.28.tar.gz
+04845814a777a3371d5293bae9a84ef4 func-0.30.tar.gz
More information about the scm-commits
mailing list