forked from pool/ca-certificates
- require coreutils for %post script
OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=24
This commit is contained in:
parent
07173a5ad6
commit
3ebfdf407d
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 24 11:57:53 UTC 2011 - coolo@suse.com
|
||||
|
||||
- require coreutils for %post script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 12:49:52 UTC 2011 - lnussel@suse.de
|
||||
|
||||
|
@ -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
|
||||
@ -45,6 +45,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Url: http://gitorious.org/opensuse/ca-certificates
|
||||
#
|
||||
Requires: openssl
|
||||
# needed for %post
|
||||
Requires: coreutils
|
||||
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
|
||||
@ -54,7 +56,6 @@ BuildArch: noarch
|
||||
|
||||
%if %{with java}
|
||||
|
||||
|
||||
%package -n java-ca-certificates
|
||||
License: GPLv2+
|
||||
Group: Productivity/Networking/Security
|
||||
@ -65,25 +66,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 +93,6 @@ EOF
|
||||
fastjar cfm keystore.jar MANIFEST.MF keystore*.class
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/%{etccadir}
|
||||
mkdir -p %{buildroot}/%{usrcadir}
|
||||
@ -120,7 +116,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 +129,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 +156,6 @@ rm -rf %{buildroot}
|
||||
|
||||
%if %{with java}
|
||||
|
||||
|
||||
%files -n java-ca-certificates
|
||||
%defattr(-, root, root)
|
||||
%dir %{_prefix}/lib/ca-certificates/java
|
||||
@ -174,6 +165,4 @@ rm -rf %{buildroot}
|
||||
%ghost /var/lib/ca-certificates/gcj-cacerts
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user