Accepting request 196665 from Java:packages

- use add_maven_Depmap from javapackages-tools
- fix obsoletes version

OBS-URL: https://build.opensuse.org/request/show/196665
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cglib?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2013-09-03 20:02:03 +00:00 committed by Git OBS Bridge
commit 82f6eafbda
2 changed files with 15 additions and 18 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 28 13:29:40 UTC 2013 - mvyskocil@suse.com
- use add_maven_Depmap from javapackages-tools
- fix obsoletes version
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 18 13:30:41 UTC 2012 - mvyskocil@suse.cz Fri May 18 13:30:41 UTC 2012 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package cglib # spec file for package cglib
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -37,7 +37,7 @@ BuildRequires: objectweb-asm
BuildRequires: unzip BuildRequires: unzip
Provides: %{name}-nohook = %{version}-%{release} Provides: %{name}-nohook = %{version}-%{release}
Obsoletes: %{name}-nohook <= %{version}-%{release} Obsoletes: %{name}-nohook < %{version}-%{release}
%description %description
cglib is a powerful, high performance and quality Code Generation cglib is a powerful, high performance and quality Code Generation
@ -65,26 +65,17 @@ ant jar javadoc
%install %install
# jars # jars
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p %{buildroot}%{_javadir}
cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc # javadoc
mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/ mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
#maven pom #maven pom
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} mkdir -p %{buildroot}%{_mavenpomdir}
cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name} %add_maven_depmap JPP-%{name}.pom %{name}.jar
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -95,6 +86,6 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc %files javadoc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}
%changelog %changelog