Hello community, here is the log from the commit of package cglib for openSUSE:Factory checked in at 2019-03-13 09:06:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cglib (Old) and /work/SRC/openSUSE:Factory/.cglib.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cglib" Wed Mar 13 09:06:15 2019 rev:21 rq:681987 version:3.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cglib/cglib.changes 2018-12-14 20:44:47.105724894 +0100 +++ /work/SRC/openSUSE:Factory/.cglib.new.28833/cglib.changes 2019-03-13 09:06:16.627442184 +0100 @@ -1,0 +2,10 @@ +Tue Mar 5 12:15:26 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream 3.2.4 +- Generate and customize ant build system +- Removed patches: + * cglib-build_xml.patch + * fix-javadoc.patch + + Not needed any more + +------------------------------------------------------------------- Old: ---- RELEASE_3_1.tar.gz cglib-3.1.pom cglib-build_xml.patch fix-javadoc.patch New: ---- RELEASE_3_2_4.tar.gz cglib-3.2.4-build.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cglib.spec ++++++ --- /var/tmp/diff_new_pack.bxsAg5/_old 2019-03-13 09:06:17.311442114 +0100 +++ /var/tmp/diff_new_pack.bxsAg5/_new 2019-03-13 09:06:17.311442114 +0100 @@ -1,7 +1,7 @@ # # spec file for package cglib # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,30 @@ # -%global tarball_name RELEASE_3_1 +%bcond_with tests +%global tarball_name RELEASE_3_2_4 Name: cglib -Version: 3.1 +Version: 3.2.4 Release: 0 Summary: Code Generation Library License: Apache-2.0 Group: Development/Libraries/Java URL: http://cglib.sourceforge.net/ Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz -Source1: http://central.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom -# Remove the repackaging step that includes other jars into the final thing -Patch0: %{name}-build_xml.patch -Patch1: fix-javadoc.patch +Source1: %{name}-%{version}-build.tar.xz BuildRequires: ant >= 1.6 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -# Needed for maven conversions BuildRequires: javapackages-local BuildRequires: objectweb-asm >= 5 Provides: %{name}-nohook = %{version}-%{release} Obsoletes: %{name}-nohook < %{version}-%{release} +Requires: mvn(org.ow2.asm:asm) BuildArch: noarch +%if %{with tests} +BuildConflicts: java-devel >= 9 +BuildRequires: ant-junit +%endif %description cglib is a powerful, high performance and quality Code Generation @@ -46,7 +48,7 @@ %package javadoc Summary: Code Generation Library -Group: Development/Libraries/Java +Group: Documentation/HTML %description javadoc cglib is a powerful, high performance and quality Code Generation @@ -54,38 +56,66 @@ runtime. %prep -%setup -q -n %{name}-%{tarball_name} -rm lib/*.jar -build-jar-repository -s -p lib objectweb-asm ant -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{tarball_name} -a1 + +%pom_disable_module cglib-nodep +%pom_disable_module cglib-integration-test +%pom_disable_module cglib-jmh +%pom_xpath_set pom:packaging 'bundle' cglib +%pom_xpath_inject pom:build/pom:plugins '<plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.4.0</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>net.sf.cglib.core</Bundle-SymbolicName> + <Export-Package>net.*</Export-Package> + <Import-Package>org.apache.tools.*;resolution:=optional,*</Import-Package> + </instructions> + </configuration> + </plugin>' cglib +%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin +%pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample +%pom_remove_plugin -r :maven-javadoc-plugin + +%pom_xpath_inject "pom:dependency[pom:artifactId='ant']" "<optional>true</optional>" cglib + +%pom_remove_parent %build -ant \ - -Dcompile.target=8 -Dcompile.source=8 \ - jar javadoc +mkdir -p lib +build-jar-repository -s -p lib objectweb-asm/asm ant/ant ant/ant-launcher +%ant \ +%if %{without tests} + -Dtest.skip=true \ +%endif + -Dcompiler.target=1.8 -Dcompiler.source=1.8 \ + package javadoc %install + # jars -mkdir -p %{buildroot}%{_javadir} -cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +install -pm 0644 %{name}-sample/target/%{name}-sample-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-sample.jar + +# poms +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-parent.pom +%add_maven_depmap %{name}/%{name}-parent.pom +install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib" +install -pm 0644 %{name}-sample/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-sample.pom +%add_maven_depmap %{name}/%{name}-sample.pom %{name}/%{name}-sample.jar # javadoc -mkdir -p %{buildroot}%{_javadocdir}/ -cp -r docs %{buildroot}%{_javadocdir}/%{name} -%fdupes -s %{buildroot}%{_javadocdir}/%{name} - -#maven pom -install -dm 755 %{buildroot}%{_mavenpomdir} -install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib" - -%files -%license LICENSE -%doc NOTICE -%{_javadir}/*.jar -%{_mavenpomdir}/* -%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -r %{name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE %files javadoc %{_javadocdir}/%{name}
