rpms/certmaster/F-10 .cvsignore, 1.6, 1.7 certmaster.spec, 1.5, 1.6 sources, 1.7, 1.8
Adrian Likins
alikins at fedoraproject.org
Wed Aug 12 15:54:23 UTC 2009
Author: alikins
Update of /cvs/pkgs/rpms/certmaster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18922
Modified Files:
.cvsignore certmaster.spec sources
Log Message:
certmaster-0.25-1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 17 Dec 2008 20:51:33 -0000 1.6
+++ .cvsignore 12 Aug 2009 15:54:23 -0000 1.7
@@ -3,3 +3,4 @@ certmaster-0.19.tar.gz
certmaster-0.20.tar.gz
certmaster-0.23.tar.gz
certmaster-0.24.tar.gz
+certmaster-0.25.tar.gz
Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/certmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- certmaster.spec 17 Dec 2008 20:47:59 -0000 1.5
+++ certmaster.spec 12 Aug 2009 15:54:23 -0000 1.6
@@ -1,31 +1,53 @@
+
+# We can run on Rhel 3'ish systems, but only if python2.3 is installed
+%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 certificate distribution framework
Name: certmaster
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25
+Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: https://fedorahosted.org/certmaster
+
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
Requires: python >= 2.3
Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+
+# NOTE: if you
+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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-Url: https://fedorahosted.org/certmaster
+%endif
+
+
%description
@@ -40,18 +62,24 @@ certmaster is a easy mechanism for distr
%install
test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
+touch $RPM_BUILD_ROOT/var/log/certmaster/certmaster.log
+touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
+
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
%{python_sitelib}/certmaster*.egg-info
%endif
%{_bindir}/certmaster
%{_bindir}/certmaster-request
%{_bindir}/certmaster-ca
+%{_bindir}/certmaster-sync
/etc/init.d/certmaster
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -61,8 +89,16 @@ rm -fr $RPM_BUILD_ROOT
%config(noreplace) /etc/logrotate.d/certmaster_rotate
%dir %{python_sitelib}/certmaster
%{python_sitelib}/certmaster/*.py*
+
%dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/certmaster.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/audit.log
+
+%attr(600,root,root) %dir /var/lib/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
%dir /var/lib/certmaster/triggers/sign/
%dir /var/lib/certmaster/triggers/sign/pre
%dir /var/lib/certmaster/triggers/sign/post
@@ -72,6 +108,8 @@ rm -fr $RPM_BUILD_ROOT
%dir /var/lib/certmaster/triggers/remove/
%dir /var/lib/certmaster/triggers/remove/pre
%dir /var/lib/certmaster/triggers/remove/post
+/var/lib/certmaster/triggers/sign/post/certmaster-sync
+/var/lib/certmaster/triggers/remove/post/certmaster-sync
%doc AUTHORS README LICENSE
%{_mandir}/man1/*.1.gz
@@ -93,6 +131,9 @@ else
done
fi
exit 0
+# fix perms on log files
+chmod 600 /var/log/certmaster/certmaster.log
+chmod 600 /var/log/certmaster/audit.log
%preun
if [ "$1" = 0 ] ; then
@@ -108,6 +149,27 @@ fi
%changelog
+* Tue May 26 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/lib/certmaster/certmaster* to spec and set perms
+- add /var/log/certmaster/certmaster.log,audit.log to spec
+ and set perms
+
+* 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-3x1
+- 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
+
* Mon Dec 12 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
- add missing dirs as per bz#473633
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 17 Dec 2008 20:51:33 -0000 1.7
+++ sources 12 Aug 2009 15:54:23 -0000 1.8
@@ -3,3 +3,4 @@ d661004b7eb0c7b43f57f0a510232bd2 certma
470c450b3c5adbbeae3d154cb9de495c certmaster-0.20.tar.gz
884faef5a2da2f5b4e8bd6782d28a284 certmaster-0.23.tar.gz
8a21725c88947133c2cc04b1fd21305e certmaster-0.24.tar.gz
+83d6115f2cff4af18e150274602c71c1 certmaster-0.25.tar.gz
More information about the fedora-extras-commits
mailing list