rpms/proguard/F-13 proguard-gui, NONE, 1.1 proguard-retrace, NONE, 1.1 .cvsignore, 1.3, 1.4 README.dist, 1.1, 1.2 proguard.desktop, 1.1, 1.2 proguard.spec, 1.6, 1.7 sources, 1.3, 1.4 proguardgui, 1.1, NONE retrace, 1.1, NONE
François Kooman
fkooman at fedoraproject.org
Fri Jun 11 12:04:34 UTC 2010
Author: fkooman
Update of /cvs/pkgs/rpms/proguard/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26498
Modified Files:
.cvsignore README.dist proguard.desktop proguard.spec sources
Added Files:
proguard-gui proguard-retrace
Removed Files:
proguardgui retrace
Log Message:
* Fri Jun 11 2010 François Kooman <fkooman at tuxed.net> - 4.5-3
- rename proguardgui to proguard-gui (and update .desktop file)
- rename retrace to proguard-retrace
- update README.dist to reflect these changes
* Tue Jun 08 2010 François Kooman <fkooman at tuxed.net> - 4.5-2
- permission fix no longer needed
* Mon Jun 7 2010 François Kooman <fkooman at tuxed.net> - 4.5-1
- update to 4.5 (see http://proguard.sourceforge.net/downloads.html)
- remove GCJ bits as GUI doesn't work with GCJ
--- NEW FILE proguard-gui ---
#!/bin/bash
. /usr/share/java-utils/java-functions
MAIN_CLASS=proguard.gui.ProGuardGUI
set_classpath "proguard"
run "$@"
--- NEW FILE proguard-retrace ---
#!/bin/bash
. /usr/share/java-utils/java-functions
MAIN_CLASS=proguard.retrace.ReTrace
set_classpath "proguard"
run "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 21 Jul 2009 18:24:02 -0000 1.3
+++ .cvsignore 11 Jun 2010 12:04:34 -0000 1.4
@@ -1 +1 @@
-proguard4.4.tar.gz
+proguard4.5.tar.gz
Index: README.dist
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/F-13/README.dist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.dist 12 Jun 2009 12:16:55 -0000 1.1
+++ README.dist 11 Jun 2010 12:04:34 -0000 1.2
@@ -11,11 +11,11 @@ One runs ProGuard from the command line
Or the ProGuard GUI from the command line with:
- $ proguardgui
+ $ proguard-gui
Or retrace:
- $ retrace
+ $ proguard-retrace
There is also a menu entry available for the ProGuard GUI.
Index: proguard.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/F-13/proguard.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proguard.desktop 12 Jun 2009 12:16:55 -0000 1.1
+++ proguard.desktop 11 Jun 2010 12:04:34 -0000 1.2
@@ -2,7 +2,7 @@
Name=ProGuard
Comment=Java class file shrinker, optimizer, obfuscator and preverifier
GenericName=Java class file shrinker, optimizer, obfuscator and preverifier
-Exec=proguardgui
+Exec=proguard-gui
Icon=proguard
Terminal=false
Type=Application
Index: proguard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/F-13/proguard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- proguard.spec 10 Jan 2010 13:44:41 -0000 1.6
+++ proguard.spec 11 Jun 2010 12:04:34 -0000 1.7
@@ -1,8 +1,6 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
Name: proguard
-Version: 4.4
-Release: 5%{?dist}
+Version: 4.5
+Release: 3%{?dist}
Summary: Java class file shrinker, optimizer, obfuscator and preverifier
Group: Development/Tools
@@ -13,27 +11,20 @@ Source0: http://downloads.sourcef
# included with ProGuard, but they don't follow Fedora practices as described
# in Packaging:Java on the wiki
Source1: proguard
-Source2: proguardgui
-Source3: retrace
+Source2: proguard-gui
+Source3: proguard-retrace
Source4: %{name}.desktop
Source5: README.dist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils
-
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
-BuildArch: noarch
-%endif
-
-BuildRequires: java-devel >= 1.5
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant
Requires: jpackage-utils
-Requires: java >= 1.5
+Requires: java >= 1:1.6.0
+
+BuildArch: noarch
%description
ProGuard is a free Java class file shrinker, optimizer, obfuscator and
@@ -77,9 +68,6 @@ find -name '*.class' -exec rm -f '{}' \;
sed -i '/class-path/I d' src/%{name}/gui/MANIFEST.MF
sed -i '/class-path/I d' src/%{name}/retrace/MANIFEST.MF
-# why is this executable?
-chmod -x examples/dictionaries/shakespeare.txt
-
# 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
@@ -112,7 +100,7 @@ cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_bin
cp -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/
chmod 0755 ${RPM_BUILD_ROOT}%{_bindir}/*
-#install the desktop file for proguardgui
+#install the desktop file for proguard-gui
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4}
#copy icons
@@ -123,17 +111,7 @@ cp -p %{name}32.png ${RPM_BUILD_ROOT}%{_
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps
cp -p %{name}16.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
# update icon cache
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -141,12 +119,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
fi
%postun
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
# update icon cache
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -164,12 +136,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_javadir}/%{name}/retrace.jar
%{_javadir}/%{name}/retrace-%{version}.jar
%{_bindir}/proguard
-%{_bindir}/retrace
-
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
+%{_bindir}/proguard-retrace
%doc README examples/ README.dist
%files manual
@@ -178,13 +145,25 @@ rm -rf ${RPM_BUILD_ROOT}
%files gui
%defattr(-,root,root,-)
-%{_bindir}/proguardgui
+%{_bindir}/%{name}-gui
%{_javadir}/%{name}/proguardgui.jar
%{_javadir}/%{name}/proguardgui-%{version}.jar
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*/*/apps/*
%changelog
+* Fri Jun 11 2010 François Kooman <fkooman at tuxed.net> - 4.5-3
+- rename proguardgui to proguard-gui (and update .desktop file)
+- rename retrace to proguard-retrace
+- update README.dist to reflect these changes
+
+* Tue Jun 08 2010 François Kooman <fkooman at tuxed.net> - 4.5-2
+- permission fix no longer needed
+
+* Mon Jun 7 2010 François Kooman <fkooman at tuxed.net> - 4.5-1
+- update to 4.5 (see http://proguard.sourceforge.net/downloads.html)
+- remove GCJ bits as GUI doesn't work with GCJ
+
* Sun Jan 10 2010 François Kooman <fkooman at tuxed.net> - 4.4-5
- own directory /usr/share/java/proguard
- don't include proguardgui.jar in proguard main package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proguard/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 21 Jul 2009 18:24:02 -0000 1.3
+++ sources 11 Jun 2010 12:04:34 -0000 1.4
@@ -1 +1 @@
-18b8d00951be8d9f85a813c67a46b8ec proguard4.4.tar.gz
+e34ce1b96cd09dc90b152c411f440deb proguard4.5.tar.gz
--- proguardgui DELETED ---
--- retrace DELETED ---
More information about the scm-commits
mailing list