From 96af71db61acac4adb3a1c8a73391467b3572a49 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 20 Nov 2012 14:15:36 -0500 Subject: Removed obsolete cmake modules, updated spec files --- specs/pki-console.spec | 23 ++++++--------------- specs/pki-core.spec | 3 ++- specs/pki-ra.spec | 54 ++++++------------------------------------------ specs/pki-tps.spec | 56 ++++++-------------------------------------------- 4 files changed, 20 insertions(+), 116 deletions(-) (limited to 'specs') diff --git a/specs/pki-console.spec b/specs/pki-console.spec index bda704e94..a8b010ea3 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -7,7 +7,7 @@ Name: pki-console Version: 10.0.0 -Release: %{?relprefix}11%{?prerel}%{?dist} +Release: %{?relprefix}12%{?prerel}%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -17,39 +17,24 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake +BuildRequires: cmake >= 2.8.10.1-1 BuildRequires: idm-console-framework BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ldapjdk BuildRequires: nspr-devel BuildRequires: nss-devel -%if 0%{?fedora} >= 17 BuildRequires: junit -%else -BuildRequires: junit4 -%endif -%if 0%{?fedora} >= 16 BuildRequires: jpackage-utils >= 1.7.5-10 BuildRequires: jss >= 4.2.6-24 BuildRequires: pki-base >= 10.0.0 -%else -BuildRequires: jpackage-utils -BuildRequires: jss >= 4.2.6-24 -BuildRequires: pki-base -%endif Requires: idm-console-framework Requires: java >= 1:1.6.0 Requires: ldapjdk Requires: pki-base >= 10.0.0 Requires: pki-console-theme >= 9.0.0 -%if 0%{?fedora} >= 16 Requires: jpackage-utils >= 1.7.5-10 Requires: jss >= 4.2.6-24 -%else -Requires: jpackage-utils -Requires: jss >= 4.2.6-24 -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -102,6 +87,10 @@ cd build %changelog +* Tue Nov 20 2012 Ade Lee 10.0.0-0.12.b3 +- Removed conditionals for fedora < 17 +- Update cmake version + * Mon Nov 12 2012 Ade Lee 10.0.0-0.11.b3 - Update release to b3 diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 149191cf8..22ae5699d 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -22,7 +22,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake +BuildRequires: cmake >= 2.8.10.1-1 BuildRequires: zip BuildRequires: java-devel >= 1:1.6.0 BuildRequires: redhat-rpm-config @@ -975,6 +975,7 @@ fi * Mon Nov 19 2012 Ade Lee 10.0.0-0.53.b3 - Cleaned up spec file to provide only support rhel 7+, f17+ - Added resteasy-base dependency for rhel 7 +- Update cmake version * Mon Nov 12 2012 Ade Lee 10.0.0-0.52.b3 - Update release to b3 diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index 0cff1af89..aa5b4516d 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -7,7 +7,7 @@ Name: pki-ra Version: 10.0.0 -Release: %{?relprefix}11%{?prerel}%{?dist} +Release: %{?relprefix}12%{?prerel}%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -17,12 +17,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# specify '_unitdir' macro for platforms that don't use 'systemd' -%if 0%{?rhel} || 0%{?fedora} < 16 -%define _unitdir /lib/systemd/system -%endif - -BuildRequires: cmake +BuildRequires: cmake >= 2.8.10.1-1 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -34,17 +29,9 @@ Requires: pki-ra-theme >= 10.0.0 Requires: perl-DBD-SQLite Requires: sqlite Requires: /usr/sbin/sendmail -%if 0%{?fedora} >= 16 Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -Requires: initscripts -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -133,7 +120,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/scep/*.cgi chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/server/*.cgi chmod 755 %{buildroot}%{_datadir}/pki/ra/docroot/ee/user/*.cgi -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs @@ -145,34 +131,9 @@ echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfile echo "D /var/lock/pki/ra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf echo "D /var/run/pki/ra 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-ra.conf -%endif -%if 0%{?fedora} >= 16 %{__rm} %{buildroot}%{_initrddir}/pki-rad -%else -%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-rad.target.wants -%{__rm} -rf %{buildroot}%{_unitdir} -%endif - -%if 0%{?rhel} || 0%{?fedora} < 16 -%post -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add pki-rad || : - - -%preun -if [ $1 = 0 ] ; then - /sbin/service pki-rad stop >/dev/null 2>&1 - /sbin/chkconfig --del pki-rad || : -fi - -%postun -if [ "$1" -ge "1" ] ; then - /sbin/service pki-rad condrestart >/dev/null 2>&1 || : -fi - -%else %post # Attempt to update ALL old "RA" instances to "systemd" if [ -d /etc/sysconfig/pki/ra ]; then @@ -211,19 +172,14 @@ fi if [ "$1" -ge "1" ] ; then /bin/systemctl try-restart pki-rad.target >/dev/null 2>&1 || : fi -%endif %files %defattr(-,root,root,-) %doc base/ra/LICENSE -%if 0%{?fedora} >= 16 %dir %{_sysconfdir}/systemd/system/pki-rad.target.wants %{_unitdir}/pki-rad@.service %{_unitdir}/pki-rad.target -%else -%{_initrddir}/pki-rad -%endif %dir %{_datadir}/pki/ra %{_datadir}/pki/ra/conf/ %{_datadir}/pki/ra/docroot/ @@ -232,17 +188,19 @@ fi %{_datadir}/pki/ra/setup/ %dir %{_localstatedir}/lock/pki/ra %dir %{_localstatedir}/run/pki/ra -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs # * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft # %config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-ra.conf -%endif %changelog +* Tue Nov 20 2012 Ade Lee 10.0.0-0.12.b3 +- Update spec fiel to support fedora >= 17 and rhel 7+ +- Update cmake version + * Mon Nov 12 2012 Ade Lee 10.0.0-0.11.b3 - Update release to b3 diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index ac1f4dc57..8f014e692 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -7,7 +7,7 @@ Name: pki-tps Version: 10.0.0 -Release: %{?relprefix}11%{?prerel}%{?dist} +Release: %{?relprefix}12%{?prerel}%{?dist} Summary: Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ License: LGPLv2 @@ -15,12 +15,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# specify '_unitdir' macro for platforms that don't use 'systemd' -%if 0%{?rhel} || 0%{?fedora} < 16 -%define _unitdir /lib/systemd/system -%endif - -BuildRequires: cmake +BuildRequires: cmake >= 2.8.10.1-1 BuildRequires: apr-devel BuildRequires: apr-util-devel BuildRequires: cyrus-sasl-devel @@ -41,17 +36,9 @@ Requires: perl-Mozilla-LDAP Requires: pki-server >= 10.0.0 Requires: pki-tps-theme >= 10.0.0 -%if 0%{?fedora} >= 16 Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -Requires: initscripts -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -160,7 +147,6 @@ cd %{buildroot}/%{_datadir}/pki/tps/docroot mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d echo %{_libdir}/tps > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs @@ -172,36 +158,9 @@ echo "D /var/lock/pki 0755 root root -" > %{buildroot}%{_sysconfdir}/tmpfil echo "D /var/lock/pki/tps 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf echo "D /var/run/pki 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf echo "D /var/run/pki/tps 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfiles.d/pki-tps.conf -%endif -%if 0%{?fedora} >= 16 %{__rm} %{buildroot}%{_initrddir}/pki-tpsd -%else -%{__rm} -rf %{buildroot}%{_sysconfdir}/systemd/system/pki-tpsd.target.wants -%{__rm} -rf %{buildroot}%{_unitdir} -%endif - -%if 0%{?rhel} || 0%{?fedora} < 16 -%post -/sbin/ldconfig -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add pki-tpsd || : - - -%preun -if [ $1 = 0 ] ; then - /sbin/service pki-tpsd stop >/dev/null 2>&1 - /sbin/chkconfig --del pki-tpsd || : -fi - - -%postun -if [ "$1" -ge "1" ] ; then - /sbin/service pki-tpsd condrestart >/dev/null 2>&1 || : -fi - -%else %post # Attempt to update ALL old "TPS" instances to "systemd" if [ -d /etc/sysconfig/pki/tps ]; then @@ -240,18 +199,13 @@ fi if [ "$1" -ge "1" ] ; then /bin/systemctl try-restart pki-tpsd.target >/dev/null 2>&1 || : fi -%endif %files %defattr(-,root,root,-) %doc base/tps/LICENSE -%if 0%{?fedora} >= 16 %dir %{_sysconfdir}/systemd/system/pki-tpsd.target.wants %{_unitdir}/pki-tpsd@.service %{_unitdir}/pki-tpsd.target -%else -%{_initrddir}/pki-tpsd -%endif %config(noreplace) %{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf %{_bindir}/tpsclient %{_libdir}/httpd/modules/* @@ -267,17 +221,19 @@ fi %{_datadir}/pki/tps/setup/ %dir %{_localstatedir}/lock/pki/tps %dir %{_localstatedir}/run/pki/tps -%if 0%{?fedora} >= 15 # Details: # # * https://fedoraproject.org/wiki/Features/var-run-tmpfs # * https://fedoraproject.org/wiki/Tmpfiles.d_packaging_draft # %config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tps.conf -%endif %changelog +* Tue Nov 20 2012 Ade Lee 10.0.0-0.12.b3 +- Update spec fiel to support fedora >= 17 and rhel 7+ +- Update cmake version + * Mon Nov 12 2012 Ade Lee 10.0.0-0.11.b3 - Update release to b3 -- cgit