Hello community, here is the log from the commit of package proguard for openSUSE:Factory checked in at 2019-12-09 21:36:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proguard (Old) and /work/SRC/openSUSE:Factory/.proguard.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proguard" Mon Dec 9 21:36:23 2019 rev:2 rq:755239 version:6.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/proguard/proguard.changes 2019-11-13 13:28:47.635726894 +0100 +++ /work/SRC/openSUSE:Factory/.proguard.new.4691/proguard.changes 2019-12-09 21:36:39.994064052 +0100 @@ -1,0 +2,5 @@ +Fri Dec 6 16:14:10 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to version 6.2.0 + +------------------------------------------------------------------- Old: ---- README.dist proguard.desktop proguard5.3.3.tar.gz New: ---- proguard6.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proguard.spec ++++++ --- /var/tmp/diff_new_pack.lzN6pX/_old 2019-12-09 21:36:41.534063445 +0100 +++ /var/tmp/diff_new_pack.lzN6pX/_new 2019-12-09 21:36:41.534063445 +0100 @@ -1,7 +1,7 @@ # # spec file for package proguard # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,20 @@ Name: proguard -Version: 5.3.3 +Version: 6.2.0 Release: 0 Summary: Java class file shrinker, optimizer, obfuscator and preverifier License: GPL-2.0-or-later Group: Development/Libraries/Java URL: https://www.guardsquare.com/en/proguard Source0: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz -Source1: %{name}.desktop -Source2: README.dist -BuildRequires: ant -BuildRequires: hicolor-icon-theme -BuildRequires: java-devel >= 1.6 -BuildRequires: javapackages-tools -Requires: java >= 1.6 +BuildRequires: java-devel >= 8 +BuildRequires: maven-local +BuildRequires: mvn(com.google.code.gson:gson) +BuildRequires: mvn(org.apache.ant:ant) Requires: javapackages-tools +Obsoletes: %{name}-manual + BuildArch: noarch %description @@ -42,91 +41,61 @@ names. Finally, it preverifies the processed code for Java 6 or for Java Micro Edition. -%package manual -Summary: Manual for %{name} -Group: Documentation/HTML -Requires: javapackages-tools - -%description manual -The manual for %{name}. - %package gui Summary: GUI for %{name} Group: Development/Libraries/Java -# we convert the favicon.ico to png files of different sizes, so we require -# ImageMagick -BuildRequires: ImageMagick -BuildRequires: desktop-file-utils -Requires: %{name} = %{version}-%{release} Requires: javapackages-tools %description gui A GUI for %{name}. +%package -n ant-%{name} +Summary: Ant task for %{name} +Group: Development/Libraries/Java + +%description -n ant-%{name} +Ant task for %{name} + + %prep %setup -q -n %{name}%{version} -# remove all jar and class files, the snippet from Packaging:Java does -# not work -find -name '*.jar' -exec rm -f '{}' \; -find -name '*.class' -exec rm -f '{}' \; - -# remove the Class-Path from MANIFESTs -sed -i '/class-path/I d' src/%{name}/gui/MANIFEST.MF -sed -i '/class-path/I d' src/%{name}/retrace/MANIFEST.MF - -# this will create three png files from the favicon that contains multiple size -# icons: 0: 48x48, 1: 32x32, 2: 16x16 -convert docs/favicon.ico %{name}.png -cp -p %{name}-0.png %{name}48.png -cp -p %{name}-1.png %{name}32.png -cp -p %{name}-2.png %{name}16.png +find -name '*.jar' -print -delete +find -name '*.class' -print -delete -# add README.dist -cp -p %{SOURCE2} . +%pom_disable_module ../gradle buildscripts +%pom_xpath_remove -r pom:addClasspath buildscripts +%pom_remove_plugin -r :maven-source-plugin buildscripts +%pom_remove_plugin -r :maven-javadoc-plugin buildscripts + +%mvn_package :*anttask anttask +%mvn_package :*gui gui +%mvn_file :%{name}-base %{name}/%{name}-base %{name}/%{name} %build -cd buildscripts/ -# build ProGuard, ProGuardGUI, retrace and anttask -ant -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 -Dant.jar=%{_javadir}/ant.jar basic anttask +%mvn_build -f -j -- -f buildscripts/pom.xml -Dsource=8 %install -mkdir -p %{buildroot}%{_javadir}/%{name}/ -cp -p lib/%{name}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -cp -p lib/%{name}gui.jar %{buildroot}%{_javadir}/%{name}/%{name}gui.jar -cp -p lib/retrace.jar %{buildroot}%{_javadir}/%{name}/retrace.jar +%mvn_install mkdir -p %{buildroot}%{_bindir} -%jpackage_script proguard.ProGuard "" "" proguard proguard true -%jpackage_script proguard.gui.ProGuardGUI "" "" proguard proguard-gui true -%jpackage_script proguard.retrace.ReTrace "" "" proguard proguard-retrace true - -#install the desktop file for proguard-gui -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} - -#copy icons -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps -cp -p %{name}48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -cp -p %{name}32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps -cp -p %{name}16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png - -%files -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/proguard.jar -%{_javadir}/%{name}/retrace.jar -%{_bindir}/proguard -%{_bindir}/proguard-retrace -%doc README examples/ README.dist +%jpackage_script proguard.ProGuard "" "" %{name} %{name} true +%jpackage_script proguard.gui.ProGuardGUI "" "" %{name} %{name}-gui true +%jpackage_script proguard.retrace.ReTrace "" "" %{name} %{name}-retrace true + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d +echo "proguard" > %{buildroot}%{_sysconfdir}/ant.d/%{name} + +%files -f .mfiles +%{_bindir}/%{name} +%{_bindir}/%{name}-retrace +%doc README.md +%license LICENSE.md LICENSE_exception.md -%files manual -%doc docs/* +%files -n ant-%{name} -f .mfiles-anttask +%config(noreplace) %{_sysconfdir}/ant.d/%{name} -%files gui +%files gui -f .mfiles-gui %{_bindir}/%{name}-gui -%{_javadir}/%{name}/proguardgui.jar -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/*/*/apps/* %changelog ++++++ proguard5.3.3.tar.gz -> proguard6.2.0.tar.gz ++++++ ++++ 331580 lines of diff (skipped)
