From 9ed344b181646d048933842800836f606a8b3937c280c161497d8863ff5bc6fc Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Thu, 14 Nov 2013 11:47:27 +0000 Subject: [PATCH] - Don't own /etc/java/security to not clash with javapackages-tools - Don't mark random files as config OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=13 --- bouncycastle.changes | 6 ++++++ bouncycastle.spec | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bouncycastle.changes b/bouncycastle.changes index 32ed586..11e8290 100644 --- a/bouncycastle.changes +++ b/bouncycastle.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 14 11:45:43 UTC 2013 - mvyskocil@suse.com + +- Don't own /etc/java/security to not clash with javapackages-tools +- Don't mark random files as config + ------------------------------------------------------------------- Mon Sep 9 11:05:33 UTC 2013 - tchvatal@suse.com diff --git a/bouncycastle.spec b/bouncycastle.spec index d0778c3..7f5feda 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -92,24 +92,24 @@ pushd src popd %install -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d -touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-%{classname} +install -dm 755 %{buildroot}%{_sysconfdir}/java/security/security.d +touch %{buildroot}%{_sysconfdir}/java/security/security.d/2000-%{classname} # install bouncy castle provider -install -dm 755 $RPM_BUILD_ROOT%{_javadir} +install -dm 755 %{buildroot}%{_javadir} install -pm 644 bcprov-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/bcprov-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir} + %{buildroot}%{_javadir}/bcprov-%{version}.jar +pushd %{buildroot}%{_javadir} ln -sf bcprov-%{version}.jar bcprov.jar popd # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr docs/* %{buildroot}%{_javadocdir}/%{name} # maven pom -install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom +install -dm 755 %{buildroot}%{_mavenpomdir} +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcprov.pom %add_maven_depmap JPP-bcprov.pom bcprov.jar %check @@ -176,9 +176,9 @@ fi %{_javadir}/bcprov.jar %{_javadir}/bcprov-%{version}.jar %{_javadir}/* -%config(noreplace) %{_sysconfdir}/java/* +%config(noreplace) %{_sysconfdir}/java/security/security.d/2000-%{classname} %{_mavenpomdir}/JPP-bcprov.pom -%config %{_mavendepmapfragdir}/%{name} +%{_mavendepmapfragdir}/%{name} %files javadoc %defattr(0644,root,root,0755)