Accepting request 206870 from Java:packages

- 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/request/show/206870
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bouncycastle?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2013-12-06 10:44:58 +00:00 committed by Git OBS Bridge
commit c6e70ac26f
2 changed files with 17 additions and 11 deletions

View File

@ -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 Mon Sep 9 11:05:33 UTC 2013 - tchvatal@suse.com

View File

@ -92,24 +92,24 @@ pushd src
popd popd
%install %install
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d install -dm 755 %{buildroot}%{_sysconfdir}/java/security/security.d
touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-%{classname} touch %{buildroot}%{_sysconfdir}/java/security/security.d/2000-%{classname}
# install bouncy castle provider # install bouncy castle provider
install -dm 755 $RPM_BUILD_ROOT%{_javadir} install -dm 755 %{buildroot}%{_javadir}
install -pm 644 bcprov-%{version}.jar \ install -pm 644 bcprov-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/bcprov-%{version}.jar %{buildroot}%{_javadir}/bcprov-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir} pushd %{buildroot}%{_javadir}
ln -sf bcprov-%{version}.jar bcprov.jar ln -sf bcprov-%{version}.jar bcprov.jar
popd popd
# javadoc # javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
# maven pom # maven pom
install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -dm 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcprov.pom
%add_maven_depmap JPP-bcprov.pom bcprov.jar %add_maven_depmap JPP-bcprov.pom bcprov.jar
%check %check
@ -176,9 +176,9 @@ fi
%{_javadir}/bcprov.jar %{_javadir}/bcprov.jar
%{_javadir}/bcprov-%{version}.jar %{_javadir}/bcprov-%{version}.jar
%{_javadir}/* %{_javadir}/*
%config(noreplace) %{_sysconfdir}/java/* %config(noreplace) %{_sysconfdir}/java/security/security.d/2000-%{classname}
%{_mavenpomdir}/JPP-bcprov.pom %{_mavenpomdir}/JPP-bcprov.pom
%config %{_mavendepmapfragdir}/%{name} %{_mavendepmapfragdir}/%{name}
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)