diff options
author | Ade Lee <alee@redhat.com> | 2013-11-15 11:46:36 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2013-11-15 14:18:35 -0500 |
commit | 03944af46c5b5a811f0fac02d03f69d0e2256668 (patch) | |
tree | 0393aa133603f4b3296c73b9c7a769e6c10f330a /specs | |
parent | 88b5bfea749ead60c609cab9ee406e09f33e93d6 (diff) | |
download | pki-03944af46c5b5a811f0fac02d03f69d0e2256668.tar.gz pki-03944af46c5b5a811f0fac02d03f69d0e2256668.tar.xz pki-03944af46c5b5a811f0fac02d03f69d0e2256668.zip |
Cleaned up spec files and update release number for release build
Ticket 788
Diffstat (limited to 'specs')
-rw-r--r-- | specs/dogtag-pki-theme.spec | 10 | ||||
-rw-r--r-- | specs/dogtag-pki.spec | 67 | ||||
-rw-r--r-- | specs/ipa-pki-theme.spec | 6 | ||||
-rw-r--r-- | specs/pki-console.spec | 6 | ||||
-rw-r--r-- | specs/pki-core.spec | 119 | ||||
-rw-r--r-- | specs/pki-migrate.spec | 6 | ||||
-rw-r--r-- | specs/pki-ra.spec | 7 | ||||
-rw-r--r-- | specs/pki-tps.spec | 6 |
8 files changed, 43 insertions, 184 deletions
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec index e53b87ab0..8e44d4559 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-theme Version: 10.1.0 -Release: 0.3%{?dist} +Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -12,11 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.7.0 -%if 0%{?fedora} >= 16 BuildRequires: jpackage-utils >= 1.7.5-10 -%else -BuildRequires: jpackage-utils -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -217,6 +213,10 @@ cd build %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.3 - Change release number for beta build diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index d69c492cd..498645d0b 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -1,7 +1,7 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite Name: dogtag-pki Version: 10.1.0 -Release: 0.2%{?dist} +Release: 1%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -9,8 +9,6 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Establish MINIMUM package versions based upon platform -%if 0%{?rhel} || 0%{?fedora} >= 19 %define dogtag_pki_theme_version 10.1.0 %define esc_version 1.1.0 %define jss_version 4.2.6-28 @@ -22,61 +20,6 @@ BuildArch: noarch %define pki_tps_version 10.1.0 %define pki_console_version 10.1.0 %define tomcatjss_version 7.1.0 -%else -%if 0%{?fedora} >= 18 -%define dogtag_pki_theme_version 10.1.0 -%define esc_version 1.1.0 -%define jss_version 4.2.6-24 -%define pki_core_version 10.1.0 -%define pki_kra_version 10.1.0 -%define pki_ocsp_version 10.1.0 -%define pki_ra_version 10.1.0 -%define pki_tks_version 10.1.0 -%define pki_tps_version 10.1.0 -%define pki_console_version 10.1.0 -%define tomcatjss_version 7.0.0-4 -%else -%if 0%{?fedora} >= 17 -%define dogtag_pki_theme_version 10.1.0 -%define esc_version 1.1.0 -%define jss_version 4.2.6-24 -%define pki_core_version 10.1.0 -%define pki_kra_version 10.1.0 -%define pki_ocsp_version 10.1.0 -%define pki_ra_version 10.1.0 -%define pki_tks_version 10.1.0 -%define pki_tps_version 10.1.0 -%define pki_console_version 10.1.0 -%define tomcatjss_version 7.0.0-3 -%else -%if 0%{?fedora} >= 16 -%define dogtag_pki_theme_version 10.1.0 -%define esc_version 1.1.0 -%define jss_version 4.2.6-24 -%define pki_core_version 10.1.0 -%define pki_kra_version 10.1.0 -%define pki_ocsp_version 10.1.0 -%define pki_ra_version 10.1.0 -%define pki_tks_version 10.1.0 -%define pki_tps_version 10.1.0 -%define pki_console_version 10.1.0 -%define tomcatjss_version 6.0.2 -%else -%define dogtag_pki_theme_version 10.1.0 -%define esc_version 1.1.0 -%define jss_version 4.2.6-24 -%define pki_core_version 10.1.0 -%define pki_kra_version 10.1.0 -%define pki_ocsp_version 10.1.0 -%define pki_ra_version 10.1.0 -%define pki_tks_version 10.1.0 -%define pki_tps_version 10.1.0 -%define pki_console_version 10.1.0 -%define tomcatjss_version 2.0.0 -%endif -%endif -%endif -%endif Requires: apache-commons-codec @@ -102,11 +45,7 @@ Requires: pki-tools >= %{pki_core_version} Requires: pki-symkey >= %{pki_core_version} Requires: pki-base >= %{pki_core_version} -%if 0%{?fedora} <= 17 -Requires: pki-selinux >= %{pki_core_version} -%else Requires: selinux-policy-base >= 3.11.1-43 -%endif # Make certain that this 'meta' package requires the latest version(s) # of ALL Dogtag PKI core javadocs @@ -186,6 +125,10 @@ rm -rf %{buildroot} %doc README %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.2 - Change release number for beta build diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec index a639f773a..c7e47da2a 100644 --- a/specs/ipa-pki-theme.spec +++ b/specs/ipa-pki-theme.spec @@ -1,6 +1,6 @@ Name: ipa-pki-theme Version: 10.1.0 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Certificate System - IPA PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -115,6 +115,10 @@ cd build %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Tue May 7 2013 Ade Lee <alee@redhat.com> 10.1.0-0.1 - Change release number for 10.1 development diff --git a/specs/pki-console.spec b/specs/pki-console.spec index 6b9b81bae..715ff6c8d 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -1,6 +1,6 @@ Name: pki-console Version: 10.1.0 -Release: 0.3%{?dist} +Release: 1%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -80,6 +80,10 @@ cd build %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.3 - Change release number for beta build diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 35c651a79..23ae3ac6e 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.1.0 -Release: 0.14%{?dist} +Release: 1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -47,22 +47,9 @@ BuildRequires: policycoreutils-python BuildRequires: python-ldap BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} || 0%{?fedora} >= 19 BuildRequires: jss >= 4.2.6-28 -%else -BuildRequires: jss >= 4.2.6-24 -%endif BuildRequires: systemd-units -%if 0%{?rhel} || 0%{?fedora} >= 19 BuildRequires: tomcatjss >= 7.1.0 -%endif -%if 0%{?fedora} == 18 -BuildRequires: tomcatjss >= 7.0.0-4 -%endif -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -BuildRequires: tomcatjss >= 6.0.2 -BuildRequires: selinux-policy-devel >= 3.10.0-151 -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -101,7 +88,6 @@ PKI Core contains ALL top-level java-based Tomcat PKI components: \ * pki-symkey \ * pki-base \ * pki-tools \ - * pki-selinux (f17 only) \ * pki-server \ * pki-ca \ * pki-kra \ @@ -123,7 +109,6 @@ required by BOTH native-based Apache AND java-based Tomcat \ Certificate System instances consisting of the following components: \ \ * pki-tools \ - * pki-selinux (f17 only) \ \ Additionally, PKI Core contains the following fundamental packages \ required ONLY by ALL java-based Tomcat Certificate System instances: \ @@ -165,11 +150,7 @@ Group: System Environment/Libraries Requires: java >= 1:1.7.0 Requires: nss Requires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} || 0%{?fedora} >= 19 Requires: jss >= 4.2.6-28 -%else -Requires: jss >= 4.2.6-24 -%endif Provides: symkey = %{version}-%{release} @@ -206,11 +187,7 @@ Requires: java >= 1:1.7.0 Requires: javassist Requires: jettison Requires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} || 0%{?fedora} >= 19 Requires: jss >= 4.2.6-28 -%else -Requires: jss >= 4.2.6-24 -%endif Requires: ldapjdk Requires: python-ldap Requires: python-lxml @@ -287,33 +264,17 @@ Requires: openldap-clients Requires: pki-base = %{version}-%{release} Requires: pki-tools = %{version}-%{release} -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -Requires: pki-selinux = %{version}-%{release} -%else Requires: selinux-policy-base >= 3.11.1-43 Obsoletes: pki-selinux -%endif -%if 0%{?fedora} >= 20 Requires: tomcat >= 7.0.47 -%else -Requires: tomcat >= 7.0.27 -%endif Requires: velocity Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%if 0%{?rhel} || 0%{?fedora} >= 19 Requires: tomcatjss >= 7.1.0 -%endif -%if 0%{?fedora} == 18 -Requires: tomcatjss >= 7.0.0-4 -%endif -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -Requires: tomcatjss >= 6.0.2 -%endif %description -n pki-server The PKI Server Framework is required by the following four PKI subsystems: @@ -329,26 +290,6 @@ The package contains scripts to create and remove PKI subsystems. %{overview} -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -%package -n pki-selinux -Summary: Certificate System - PKI Selinux Policies -Group: System Environment/Base - -BuildArch: noarch - -Requires: policycoreutils -Requires: selinux-policy-targeted -Conflicts: selinux-policy-base >= 3.11.1-43 -Requires: selinux-policy >= 3.10.0-151 - -%description -n pki-selinux -Selinux policies for the PKI components. - -This package is a part of the PKI Core used by the Certificate System. - -%{overview} -%endif - %package -n pki-ca Summary: Certificate System - Certificate Authority Group: System Environment/Daemons @@ -558,9 +499,6 @@ cd build -DRESTEASY_LIB=/usr/share/java/resteasy \ %endif %{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \ -%if ! 0%{?rhel} && 0%{?fedora} <= 17 - -DBUILD_PKI_SELINUX:BOOL=ON \ -%endif .. %{__make} VERBOSE=1 %{?_smp_mflags} all # %{__make} VERBOSE=1 %{?_smp_mflags} test @@ -577,12 +515,6 @@ sh ../pylint-build-scan.sh %{buildroot} `pwd` if [ $? -eq 1 ]; then exit 1 fi -# Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar' -%if ! 0%{?rhel} && 0%{?fedora} <= 18 - sed -i -e 's/grant codeBase "file:\/usr\/share\/java\/tomcatjss.jar" {/grant codeBase "file:\/usr\/share\/java\/tomcat7jss.jar" {/' %{buildroot}%{_datadir}/pki/server/conf/pki.policy - sed -i -e 's/pki_tomcatjss_jar=\/usr\/share\/java\/tomcatjss.jar/pki_tomcatjss_jar=\/usr\/share\/java\/tomcat7jss.jar/' %{buildroot}%{_sysconfdir}/pki/default.cfg - sed -i -e 's/ \[tomcatjss.jar\]=\${java_dir}\/tomcatjss.jar/ \[tomcatjss.jar\]=\${java_dir}\/tomcat7jss.jar/' %{buildroot}%{_datadir}/pki/scripts/operations -%endif %{__rm} %{buildroot}%{_initrddir}/pki-cad %{__rm} %{buildroot}%{_initrddir}/pki-krad @@ -608,7 +540,7 @@ fi \ %{__mkdir_p} %{buildroot}%{_localstatedir}/log/pki %{__mkdir_p} %{buildroot}%{_sharedstatedir}/pki -%if ! 0%{?rhel} && 0%{?fedora} >= 19 +%if ! 0%{?rhel} %pretrans -n pki-base -p <lua> function test(a) if posix.stat(a) then @@ -625,9 +557,9 @@ if (test("/etc/sysconfig/pki/ca") or test("/etc/sysconfig/pki/kra") or test("/etc/sysconfig/pki/ocsp") or test("/etc/sysconfig/pki/tks")) then - msg = "Unable to upgrade to Fedora 19. There are Dogtag 9 instances\n" .. + msg = "Unable to upgrade to Fedora 20. There are Dogtag 9 instances\n" .. "that will no longer work since they require Tomcat 6, and \n" .. - "Tomcat 6 is no longer available in Fedora 19.\n\n" .. + "Tomcat 6 is no longer available in Fedora 20.\n\n" .. "Please follow these instructions to migrate the instances to \n" .. "Dogtag 10:\n\n" .. "http://pki.fedoraproject.org/wiki/Migrating_Dogtag_9_Instances_to_Dogtag_10" @@ -636,17 +568,7 @@ end %endif %post -n pki-base - -%if ! 0%{?rhel} && 0%{?fedora} <= 18 -if [ "`uname -i`" == "x86_64" ] -then - sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib64\/java/' %{_datadir}/pki/etc/pki.conf -else - sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib\/java/' %{_datadir}/pki/etc/pki.conf -fi -%else - sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib\/java/' %{_datadir}/pki/etc/pki.conf -%endif +sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib\/java/' %{_datadir}/pki/etc/pki.conf if [ $1 -eq 1 ] then @@ -668,26 +590,6 @@ then rm -f %{_sysconfdir}/pki/pki.version fi -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -%pre -n pki-selinux -%saveFileContext targeted - -%post -n pki-selinux -semodule -s targeted -i %{_datadir}/selinux/modules/pki.pp -%relabel targeted - -%preun -n pki-selinux -if [ $1 = 0 ]; then - %saveFileContext targeted -fi - -%postun -n pki-selinux -if [ $1 = 0 ]; then - semodule -s targeted -r pki - %relabel targeted -fi -%endif - %post -n pki-ca # Attempt to update ALL old "CA" instances to "systemd" if [ -d /etc/sysconfig/pki/ca ]; then @@ -993,13 +895,6 @@ fi %{_datadir}/pki/setup/ %{_datadir}/pki/server/ -%if ! 0%{?rhel} && 0%{?fedora} <= 17 -%files -n pki-selinux -%defattr(-,root,root,-) -%doc base/selinux/LICENSE -%{_datadir}/selinux/modules/pki.pp -%endif - %files -n pki-ca %defattr(-,root,root,-) %doc base/ca/LICENSE @@ -1071,6 +966,10 @@ fi %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.14 - Change release number for beta build diff --git a/specs/pki-migrate.spec b/specs/pki-migrate.spec index 2c233c42c..a025482e7 100644 --- a/specs/pki-migrate.spec +++ b/specs/pki-migrate.spec @@ -1,6 +1,6 @@ Name: pki-migrate Version: 10.1.0 -Release: 0.2%{?dist} +Release: 1%{?dist} Summary: Red Hat Certificate System - PKI Migration Scripts URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -71,6 +71,10 @@ cd build %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Fri Jun 14 2013 Endi S. Dewata <edewata@redhat.com> 10.1.0-0.2 - Updated dependencies to Java 1.7. diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index 48f522aec..03c9ad931 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -1,6 +1,6 @@ Name: pki-ra Version: 10.1.0 -Release: 0.5%{?dist} +Release: 1%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -50,7 +50,6 @@ Core package: * pki-server * pki-tools - * pki-selinux (f17 only) Additionally, Certificate System requires ONE AND ONLY ONE of the following "Mutually-Exclusive" PKI Theme packages: @@ -198,6 +197,10 @@ fi %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Trac Ticket 788 - Clean up spec files +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.5 - Change release number for beta build diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index 418c52d0a..2ade49c56 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -1,6 +1,6 @@ Name: pki-tps Version: 10.1.0 -Release: 0.7%{?dist} +Release: 1%{?dist} Summary: Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ License: LGPLv2 @@ -66,7 +66,6 @@ PKI Core package: \ \ * pki-server \ * pki-tools \ - * pki-selinux (f17 only) \ \ Additionally, Certificate System requires ONE AND ONLY ONE of the \ following "Mutually-Exclusive" PKI Theme packages: \ @@ -240,6 +239,9 @@ fi %changelog +* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1 +- Update release number for release build + * Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.7 - Change release number for beta build |