diff --git a/_service:format_spec_file:ca-certificates.spec b/_service:format_spec_file:ca-certificates.spec deleted file mode 100644 index 03ecfa8..0000000 --- a/_service:format_spec_file:ca-certificates.spec +++ /dev/null @@ -1,179 +0,0 @@ -# -# spec file for package ca-certificates -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - -%bcond_without java - -BuildRequires: openssl -%if %{with java} -BuildRequires: gcc-java -BuildRequires: fastjar -%endif - -Name: ca-certificates -%define ssletcdir %{_sysconfdir}/ssl -%define etccadir %{ssletcdir}/certs -%define cabundle /var/lib/ca-certificates/ca-bundle.pem -%define usrcadir %{_datadir}/ca-certificates -License: GPLv2+ -Group: Productivity/Networking/Security -Version: 1 -Release: 8 -Summary: Utilities for system wide CA certificate installation -Source0: update-ca-certificates -Source1: update-ca-certificates.8 -Source2: GPL-2.0.txt -Source3: certbundle.run -Source4: keystore.java -Source5: java.run -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://gitorious.org/opensuse/ca-certificates -# -Requires: openssl -Recommends: ca-certificates-mozilla -# we need to obsolete openssl-certs to make sure it's files are -# gone when a package providing actual certificates gets -# installed (bnc#594434). -Obsoletes: openssl-certs < 0.9.9 -BuildArch: noarch - -%if %{with java} - - -%package -n java-ca-certificates -License: GPLv2+ -Group: Productivity/Networking/Security -Summary: Utilities CA certificate import to gcj -Requires(post): ca-certificates -Supplements: packageand(gcj-compat:ca-certificates) -Supplements: packageand(java-1_6_0-openjdk:ca-certificates) -Supplements: packageand(java-1_6_0-sun:ca-certificates) -%endif - - -%description -Utilities for system wide CA certificate installation - -%if %{with java} - - -%description -n java-ca-certificates -Utilities for CA certificate installation for gcj and openjdk Java -%endif - - -%prep -%setup -qcT -install -m 755 %{SOURCE0} . -install -m 644 %{SOURCE1} . -install -m 644 %{SOURCE2} COPYING - - -%build -%if %{with java} -gcj -C %SOURCE4 -d . -# emulate -e option of jar for fastjar -cat < MANIFEST.MF -Manifest-Version: 1.0 -Created-By: 0.98 -Main-Class: keystore -EOF -fastjar cfm keystore.jar MANIFEST.MF keystore*.class -%endif - - -%install -mkdir -p %{buildroot}/%{etccadir} -mkdir -p %{buildroot}/%{usrcadir} -mkdir -p %{buildroot}/%{_sbindir} -mkdir -p %{buildroot}/%{_mandir}/man8 -mkdir -p %{buildroot}/etc/ca-certificates/update.d -mkdir -p %{buildroot}%{_prefix}/lib/ca-certificates/update.d -install -D -m 644 /dev/null %{buildroot}/%{cabundle} -install -m 644 /dev/null %{buildroot}/etc/ca-certificates.conf -install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/lib/ca-certificates/update.d -install -m 755 %{SOURCE5} %{buildroot}%{_prefix}/lib/ca-certificates/update.d -ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem - -install -m 755 update-ca-certificates %{buildroot}/%{_sbindir} -install -m 644 update-ca-certificates.8 %{buildroot}/%{_mandir}/man8 -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/ca-bundle.pem -%if %{with java} -mkdir -p %{buildroot}%{_prefix}/lib/ca-certificates/java -install -m 644 keystore.jar %{buildroot}%{_prefix}/lib/ca-certificates/java -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/gcj-cacerts -%endif - - -%post -# this is just needed for those updating Factory, -# can be removed before 11.3 -if [ "$1" -ge 1 ]; then - rm -f /etc/ca-certificates/update.d/certbundle.run -fi -# force rebuilding all certificate stores. -# This also makes sure we update the hash links in /etc/ssl/certs -# as openssl changed the hash format between 0.9.8 and 1.0 -update-ca-certificates -f || true - -%if %{with java} - - -%post -n java-ca-certificates -update-ca-certificates || true -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-, root, root) -%dir %{usrcadir} -%dir %{etccadir} -%doc COPYING -%ghost %config(noreplace) /etc/ca-certificates.conf -%{ssletcdir}/ca-bundle.pem -%ghost %{cabundle} -%dir /etc/ca-certificates -%dir /etc/ca-certificates/update.d -%dir %{_prefix}/lib/ca-certificates -%dir %{_prefix}/lib/ca-certificates/update.d -%dir /var/lib/ca-certificates -%{_prefix}/lib/ca-certificates/update.d/certbundle.run -%{_sbindir}/update-ca-certificates -%{_mandir}/man8/update-ca-certificates.8* -%ghost /var/lib/ca-certificates/ca-bundle.pem - -%if %{with java} - - -%files -n java-ca-certificates -%defattr(-, root, root) -%dir %{_prefix}/lib/ca-certificates/java -%{_prefix}/lib/ca-certificates/update.d/java.run -%{_prefix}/lib/ca-certificates/java/keystore.jar -%ghost /var/lib/ca-certificates/java-cacerts -%ghost /var/lib/ca-certificates/gcj-cacerts -%endif - - - -%changelog diff --git a/ca-certificates.changes b/ca-certificates.changes index 94028c1..a4e7293 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jun 20 12:49:51 UTC 2011 - lnussel@suse.de +Mon Jun 20 12:49:52 UTC 2011 - lnussel@suse.de - fix spurious rpm warning if no java exists (bnc#634793) - move java.run to java-ca-certificates diff --git a/ca-certificates.spec b/ca-certificates.spec index f436eba..03ecfa8 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -1,7 +1,7 @@ # -# spec file for package ca-certificates (Version 1) +# spec file for package ca-certificates # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,6 +54,7 @@ BuildArch: noarch %if %{with java} + %package -n java-ca-certificates License: GPLv2+ Group: Productivity/Networking/Security @@ -64,21 +65,25 @@ Supplements: packageand(java-1_6_0-openjdk:ca-certificates) Supplements: packageand(java-1_6_0-sun:ca-certificates) %endif + %description Utilities for system wide CA certificate installation %if %{with java} + %description -n java-ca-certificates Utilities for CA certificate installation for gcj and openjdk Java %endif + %prep %setup -qcT install -m 755 %{SOURCE0} . install -m 644 %{SOURCE1} . install -m 644 %{SOURCE2} COPYING + %build %if %{with java} gcj -C %SOURCE4 -d . @@ -91,6 +96,7 @@ EOF fastjar cfm keystore.jar MANIFEST.MF keystore*.class %endif + %install mkdir -p %{buildroot}/%{etccadir} mkdir -p %{buildroot}/%{usrcadir} @@ -114,6 +120,7 @@ install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/gcj-cacerts %endif + %post # this is just needed for those updating Factory, # can be removed before 11.3 @@ -127,13 +134,16 @@ update-ca-certificates -f || true %if %{with java} + %post -n java-ca-certificates update-ca-certificates || true %endif + %clean rm -rf %{buildroot} + %files %defattr(-, root, root) %dir %{usrcadir} @@ -154,6 +164,7 @@ rm -rf %{buildroot} %if %{with java} + %files -n java-ca-certificates %defattr(-, root, root) %dir %{_prefix}/lib/ca-certificates/java @@ -163,4 +174,6 @@ rm -rf %{buildroot} %ghost /var/lib/ca-certificates/gcj-cacerts %endif + + %changelog