From b4880c4ea9e6d84a032a164e758c23e1bbc780a5f82b6f688d2226bf8c39b5c8 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 21 Jun 2011 07:21:43 +0000 Subject: [PATCH] Autobuild autoformatter for 74205 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ca-certificates?expand=0&rev=11 --- ca-certificates.spec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ca-certificates.spec b/ca-certificates.spec index 03ecfa8..30b1fdf 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -33,7 +33,7 @@ Name: ca-certificates License: GPLv2+ Group: Productivity/Networking/Security Version: 1 -Release: 8 +Release: 12 Summary: Utilities for system wide CA certificate installation Source0: update-ca-certificates Source1: update-ca-certificates.8 @@ -54,7 +54,6 @@ BuildArch: noarch %if %{with java} - %package -n java-ca-certificates License: GPLv2+ Group: Productivity/Networking/Security @@ -65,25 +64,21 @@ 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 . @@ -96,7 +91,6 @@ EOF fastjar cfm keystore.jar MANIFEST.MF keystore*.class %endif - %install mkdir -p %{buildroot}/%{etccadir} mkdir -p %{buildroot}/%{usrcadir} @@ -120,7 +114,6 @@ 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 @@ -134,16 +127,13 @@ 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} @@ -164,7 +154,6 @@ rm -rf %{buildroot} %if %{with java} - %files -n java-ca-certificates %defattr(-, root, root) %dir %{_prefix}/lib/ca-certificates/java @@ -174,6 +163,4 @@ rm -rf %{buildroot} %ghost /var/lib/ca-certificates/gcj-cacerts %endif - - %changelog