diff --git a/cglib.changes b/cglib.changes index d4fb6cb..b043a07 100644 --- a/cglib.changes +++ b/cglib.changes @@ -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 diff --git a/cglib.spec b/cglib.spec index d7d524c..08fdb23 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ BuildRequires: objectweb-asm BuildRequires: unzip Provides: %{name}-nohook = %{version}-%{release} -Obsoletes: %{name}-nohook <= %{version}-%{release} +Obsoletes: %{name}-nohook < %{version}-%{release} %description cglib is a powerful, high performance and quality Code Generation @@ -65,26 +65,17 @@ ant jar javadoc %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +mkdir -p %{buildroot}%{_javadir} +cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # javadoc 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 -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +mkdir -p %{buildroot}%{_mavenpomdir} +cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files %defattr(-,root,root,-) @@ -95,6 +86,6 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %changelog