update to 7.4.1 [release 7.4.1-1mamba;Wed Jan 31 2024]

README.md

@@ -1,6 +1,4 @@
 # java-proguard
 
-ProGuard is a free Java class file shrinker, optimizer, and obfuscator. It removes unused
+ProGuard is a free Java class file shrinker, optimizer, and obfuscator. It removes unused classes, fields, methods, and attributes. It then optimizes the bytecode. It then renames the remaining classes, fields, and methods using short meaningless names.
-classes, fields, methods, and attributes. It then optimizes the bytecode. It then renames
-the remaining classes, fields, and methods using short meaningless names.
 

java-proguard-4.3-homedir.patch

@@ -1,27 +0,0 @@
-diff -Nru proguard4.3/bin/proguardgui.sh proguard4.3/bin-gil/proguardgui.sh
---- proguard4.3/bin/proguardgui.sh	2008-08-06 23:53:51.000000000 +0200
-+++ proguard4.3/bin-gil/proguardgui.sh	2009-04-15 03:19:34.000000000 +0200
-@@ -6,4 +6,4 @@
- PROGUARD_HOME=`dirname "$0"`
- PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
- 
--java -jar $PROGUARD_HOME/lib/proguardgui.jar "$@"
-+java -jar _PROGUARD_HOME_/lib/proguardgui.jar "$@"
-diff -Nru proguard4.3/bin/proguard.sh proguard4.3/bin-gil/proguard.sh
---- proguard4.3/bin/proguard.sh	2008-08-06 22:18:59.000000000 +0200
-+++ proguard4.3/bin-gil/proguard.sh	2009-04-15 03:19:07.000000000 +0200
-@@ -6,4 +6,4 @@
- PROGUARD_HOME=`dirname "$0"`
- PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
- 
--java -jar $PROGUARD_HOME/lib/proguard.jar "$@"
-+java -jar _PROGUARD_HOME_/lib/proguard.jar "$@"
-diff -Nru proguard4.3/bin/retrace.sh proguard4.3/bin-gil/retrace.sh
---- proguard4.3/bin/retrace.sh	2008-08-06 22:22:41.000000000 +0200
-+++ proguard4.3/bin-gil/retrace.sh	2009-04-15 03:18:49.000000000 +0200
-@@ -6,4 +6,4 @@
- PROGUARD_HOME=`dirname "$0"`
- PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
- 
--java -jar $PROGUARD_HOME/lib/retrace.jar "$@"
-+java -jar _PROGUARD_HOME_/lib/retrace.jar "$@"

java-proguard-4.3-nowtkplugin.patch

@@ -1,11 +0,0 @@
---- proguard4.3/build/build.xml	2008-08-12 23:45:59.000000000 +0200
-+++ proguard4.3/build/build.xml-gil	2009-04-15 01:59:47.000000000 +0200
-@@ -14,7 +14,7 @@
- 
-   <target name = "all"     depends = "basic,options"/>
-   <target name = "basic"   depends = "proguard,proguardgui,retrace"/>
--  <target name = "options" depends = "anttask,wtkplugin"/>
-+  <target name = "options" depends = "anttask"/>
- 
-   <target name = "proguard" depends = "classes,lib">
-     <javac nowarn      = "true"

java-proguard.spec

@@ -1,97 +1,49 @@
 %define        javahome     /usr/lib/jvm/jdk-openjdk
-%define        javadoc_bin  %{javahome}/bin/javadoc
 %define        majver       %(echo %version | cut -d. -f 1-2)
 Name:          java-proguard
-Version:       4.5.1
+Version:       7.4.1
 Release:       1mamba
 Summary:       ProGuard Java Optimizer and Obfuscator
 Group:         Development/Libraries/Java
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      gil <puntogil@libero.it>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://proguard.sourceforge.net/
+URL:           https://www.guardsquare.com/proguard
-Source0:       http://downloads.sourceforge.net/project/proguard/proguard/%{majver}/proguard%{version}.tar.gz
+Source0:       https://github.com/Guardsquare/proguard/releases/download/v%{version}/proguard-%{version}.tar.gz
-Source1:       proguard.png
 Source2:       proguardgui.png
-Source3:       retrace.png
-Source4:       proguard-script
-Source5:       proguard-gui-script
-Source6:       proguard-retrace-script
-Patch0:        java-proguard-4.3-nowtkplugin.patch
-Patch1:        java-proguard-4.3-homedir.patch
 License:       GPL
-BuildRequires: apache-ant
+## AUTOBUILDREQ-BEGIN
-BuildRequires: desktop-file-utils
+## AUTOBUILDREQ-END
-BuildRequires: ImageMagick
+BuildRequires: javapackages
-BuildRequires: jpackage-utils
 BuildRequires: java-openjdk
-Requires:      jpackage-utils
+Requires:      javapackages
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
-ProGuard is a free Java class file shrinker, optimizer, and obfuscator. It removes unused
+ProGuard is a free Java class file shrinker, optimizer, and obfuscator. It removes unused classes, fields, methods, and attributes. It then optimizes the bytecode. It then renames the remaining classes, fields, and methods using short meaningless names.
-classes, fields, methods, and attributes. It then optimizes the bytecode. It then renames
-the remaining classes, fields, and methods using short meaningless names.
 
 %package gui
 Group:         Development/Tools
 Summary:       GUI for ProGuard
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-Requires:      jpackage-utils
+Requires:      javapackages
 
 %description gui
 ProGuard, Java class file shrinker, optimizer, obfuscator, and preverifier.
-
 This package contains a GUI for ProGuard.
 
-%package javadoc
-Group:          Documentation
-Summary:        Javadoc for %{name}
-
-%description javadoc
-ProGuard, Java class file shrinker, optimizer, obfuscator, and preverifier.
-
-This package contains javadoc for %{name}.
-
 %package manual
 Group:          Documentation
 Summary:        Manual for %{name}
 
 %description manual
 ProGuard, Java class file shrinker, optimizer, obfuscator, and preverifier.
-
 This package contains documentation for %{name}.
 
 %prep
-
+%setup -q -n proguard-%{version}
-%setup -q -n proguard%{version}
+sed -i "s|/lib/|/share/java/proguard/|" bin/proguard.sh bin/proguardgui.sh bin/retrace.sh
-
-for j in $(find . -name "*.jar"); do
-       rm -rf $j
-done
-
-for c in $(find . -name "*.class"); do
-       rm -rf $c
-done
-
-sed -i '/class-path/I d' src/proguard/gui/MANIFEST.MF
-sed -i '/class-path/I d' src/proguard/retrace/MANIFEST.MF
 
 %build
-pushd build
-  unset JAVA_HOME
-  export JAVA_HOME=%{javahome}
-  export ANT_HOME=%{_datadir}/ant
-  ant -Dant.jar=%{_javadir}/ant.jar basic anttask
-
-# target all require Sun Java Wireless Toolkit
-popd
-
-%{javadoc_bin} -d apidocs \
-  -source 1.5 \
-  -classpath classes \
-  -encoding iso-8859-1 \
-  $(find src -name '*.java')
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -113,17 +65,13 @@ install -p -m 644 lib/retrace.jar \
 )
 
 mkdir -p %{buildroot}%{_bindir}
-install -m 755  %{SOURCE4} %{buildroot}%{_bindir}/proguard
+install -m 755  bin/proguard.sh %{buildroot}%{_bindir}/proguard
-install -m 755  %{SOURCE5} %{buildroot}%{_bindir}/proguard-gui
+install -m 755  bin/proguardgui.sh %{buildroot}%{_bindir}/proguard-gui
-install -m 755  %{SOURCE6} %{buildroot}%{_bindir}/retrace
+install -m 755  bin/retrace.sh %{buildroot}%{_bindir}/retrace
-
-mkdir -p %{buildroot}%{_javadocdir}/proguard-%{version}
-cp -pr apidocs/* %{buildroot}%{_javadocdir}/proguard-%{version}
-ln -sf proguard-%{version} %{buildroot}%{_javadocdir}/proguard
 
 mkdir -p %{buildroot}%{_datadir}/applications
 
-cat > proguard-gui.desktop << _GIL
+cat > proguard-gui.desktop << _END
 [Desktop Entry]
 Name=ProGuard
 Comment=Java class file shrinker, optimizer, obfuscator and preverifier
@@ -132,27 +80,28 @@ Terminal=false
 Type=Application
 Icon=proguard
 Categories=Development;Java;
-_GIL
+_END
 
 desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications proguard-gui.desktop
-
+install -D -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/proguard.png
-convert docs/favicon.ico proguard.png
-
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm 644 proguard-0.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/proguard.png
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-install -pm 644 proguard-1.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/proguard.png
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
-install -pm 644 proguard-2.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/proguard.png
-
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-
-ln -sf ../icons/hicolor/32x32/apps/proguard.png \
-  %{buildroot}%{_datadir}/pixmaps/proguard.png
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
+%post gui
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+:
+
+%postun gui
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+:
+
 %files
 %defattr(-,root,root)
 %{_bindir}/proguard
@@ -162,19 +111,7 @@ ln -sf ../icons/hicolor/32x32/apps/proguard.png \
 %{_javadir}/proguard/proguard.jar
 %{_javadir}/proguard/retrace-%{version}.jar
 %{_javadir}/proguard/retrace.jar
-%doc README docs/license.html
+%doc LICENSE
-
-%post gui
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
-
-%postun gui
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 
 %files gui
 %defattr(-,root,root)
@@ -182,19 +119,16 @@ fi
 %{_javadir}/proguard/proguardgui-%{version}.jar
 %{_javadir}/proguard/proguardgui.jar
 %{_datadir}/applications/proguard-gui.desktop
-%{_datadir}/icons/hicolor/*x*/apps/proguard.png
 %{_datadir}/pixmaps/proguard.png
 
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/proguard-%{version}
-%{_javadocdir}/proguard
-
 %files manual
 %defattr(-,root,root)
 %doc docs examples
 
 %changelog
+* Wed Jan 31 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 7.4.1-1mamba
+- update to 7.4.1
+
 * Mon Jan 17 2011 gil <puntogil@libero.it> 4.5.1-1mamba
 - update to 4.5.1
 

proguard-gui-script

@@ -1,15 +0,0 @@
-#!/bin/bash
-#. /usr/share/java-utils/java-functions
-
-unset JAVA_HOME
-export JAVA_HOME=/usr/lib/jvm/jdk-openjdk
-JAVA=$JAVA_HOME/bin/java
-
-MAIN_CLASS=proguard.gui.ProGuardGUI
-
-#set_classpath "proguard"
-
-#run "$@"
-
-CP=$(build-classpath proguard)
-$JAVA -cp $CP $MAIN_CLASS

proguard-retrace-script

@@ -1,15 +0,0 @@
-#!/bin/bash
-#. /usr/share/java-utils/java-functions
-
-unset JAVA_HOME
-export JAVA_HOME=/usr/lib/jvm/jdk-openjdk
-JAVA=$JAVA_HOME/bin/java
-
-MAIN_CLASS=proguard.retrace.ReTrace
-
-#set_classpath "proguard"
-
-#run "$@"
-
-CP=$(build-classpath proguard)
-$JAVA -cp $CP $MAIN_CLASS

proguard-script

@@ -1,15 +0,0 @@
-#!/bin/bash
-#. /usr/share/java-utils/java-functions
-
-unset JAVA_HOME
-export JAVA_HOME=/usr/lib/jvm/jdk-openjdk
-JAVA=$JAVA_HOME/bin/java
-
-MAIN_CLASS=proguard.ProGuard
-
-#set_classpath "proguard"
-
-#run "$@"
-
-CP=$(build-classpath proguard)
-$JAVA -cp $CP $MAIN_CLASS