Attachment 846627 Details for Bug 1022159 – Adapt to current packaging guidelines

[patch] Adapt to current packaging guidelines

0001-Adapt-to-current-packaging-guidelines-rhbz-1022159.patch (text/plain), 5.60 KB, created by Michael Simacek on 2014-01-07 12:13:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-01-07 12:13:33 UTC

Size: 5.60 KB

patch

obsolete

>From 5d29cf351191014670ad252f301e81994f6cc7c9 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 7 Jan 2014 13:12:00 +0100
>Subject: [PATCH] Adapt to current packaging guidelines (rhbz#1022159)
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> proguard         |  9 ---------
> proguard-gui     |  9 ---------
> proguard-retrace |  9 ---------
> proguard.spec    | 52 ++++++++++++++--------------------------------------
> 4 files changed, 14 insertions(+), 65 deletions(-)
> delete mode 100644 proguard
> delete mode 100644 proguard-gui
> delete mode 100644 proguard-retrace
>
>diff --git a/proguard b/proguard
>deleted file mode 100644
>index 6d830a2..0000000
>--- a/proguard
>+++ /dev/null
>@@ -1,9 +0,0 @@
>-#!/bin/bash
>-. /usr/share/java-utils/java-functions
>-
>-MAIN_CLASS=proguard.ProGuard
>-
>-set_classpath "proguard"
>-
>-run "$@"
>-
>diff --git a/proguard-gui b/proguard-gui
>deleted file mode 100644
>index fd1c450..0000000
>--- a/proguard-gui
>+++ /dev/null
>@@ -1,9 +0,0 @@
>-#!/bin/bash
>-. /usr/share/java-utils/java-functions
>-
>-MAIN_CLASS=proguard.gui.ProGuardGUI
>-
>-set_classpath "proguard"
>-
>-run "$@"
>-
>diff --git a/proguard-retrace b/proguard-retrace
>deleted file mode 100644
>index 43a7ea3..0000000
>--- a/proguard-retrace
>+++ /dev/null
>@@ -1,9 +0,0 @@
>-#!/bin/bash
>-. /usr/share/java-utils/java-functions
>-
>-MAIN_CLASS=proguard.retrace.ReTrace
>-
>-set_classpath "proguard"
>-
>-run "$@"
>-
>diff --git a/proguard.spec b/proguard.spec
>index 9db1e7f..24c3987 100644
>--- a/proguard.spec
>+++ b/proguard.spec
>@@ -1,22 +1,13 @@
> Name:           proguard
> Version:        4.11
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Java class file shrinker, optimizer, obfuscator and preverifier
> 
>-Group:          Development/Tools
> License:        GPLv2+
> URL:            http://proguard.sourceforge.net
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
>-# source1 through 3 are the launch scripts, there are already launch scripts 
>-# included with ProGuard, but they don't follow Fedora practices as described 
>-# in Packaging:Java on the wiki
>-Source1:        proguard
>-Source2:        proguard-gui
>-Source3:        proguard-retrace
>-Source4:        %{name}.desktop
>-Source5:        README.dist
>-
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Source1:        %{name}.desktop
>+Source2:        README.dist
> 
> BuildRequires:  jpackage-utils
> BuildRequires:  java-devel >= 1:1.6.0
>@@ -36,16 +27,13 @@ Micro Edition.
> 
> %package manual
> Summary:        Manual for %{name}
>-Group:          Documentation
> Requires:       jpackage-utils
>-Requires:       %{name} = %{version}-%{release}
> 
> %description manual
> The manual for %{name}.
> 
> %package gui
> Summary:        GUI for %{name}
>-Group:          Development/Tools
> # we convert the favicon.ico to png files of different sizes, so we require
> # ImageMagick
> BuildRequires:  ImageMagick
>@@ -76,7 +64,7 @@ cp -p %{name}-1.png %{name}32.png
> cp -p %{name}-2.png %{name}16.png
> 
> # add README.dist
>-cp -p %{SOURCE5} .
>+cp -p %{SOURCE2} .
> 
> %build
> cd build/
>@@ -84,24 +72,18 @@ cd build/
> ant -Dant.jar=%{_javadir}/ant.jar basic anttask
> 
> %install
>-rm -rf ${RPM_BUILD_ROOT}
>-
> mkdir -p ${RPM_BUILD_ROOT}%{_javadir}/%{name}/
>-cp -p lib/%{name}.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/%{name}-%{version}.jar
>-(cd ${RPM_BUILD_ROOT}%{_javadir}/%{name}/ && ln -sf %{name}-%{version}.jar %{name}.jar)
>-cp -p lib/%{name}gui.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/%{name}gui-%{version}.jar
>-(cd ${RPM_BUILD_ROOT}%{_javadir}/%{name}/ && ln -sf %{name}gui-%{version}.jar %{name}gui.jar)
>-cp -p lib/retrace.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/retrace-%{version}.jar
>-(cd ${RPM_BUILD_ROOT}%{_javadir}/%{name}/ && ln -sf retrace-%{version}.jar retrace.jar)
>+cp -p lib/%{name}.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/%{name}.jar
>+cp -p lib/%{name}gui.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/%{name}gui.jar
>+cp -p lib/retrace.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}/retrace.jar
> 
> mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
>-cp -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/
>-cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_bindir}/
>-cp -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/
>-chmod 0755 ${RPM_BUILD_ROOT}%{_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=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4}
>+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
> 
> #copy icons
> mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
>@@ -125,33 +107,27 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
>   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
> fi
> 
>-%clean
>-rm -rf ${RPM_BUILD_ROOT}
>-
> %files
>-%defattr(-,root,root,-)
> %dir %{_javadir}/%{name}
> %{_javadir}/%{name}/proguard.jar
>-%{_javadir}/%{name}/proguard-%{version}.jar
> %{_javadir}/%{name}/retrace.jar
>-%{_javadir}/%{name}/retrace-%{version}.jar
> %{_bindir}/proguard
> %{_bindir}/proguard-retrace
> %doc README examples/ README.dist
> 
> %files manual
>-%defattr(-,root,root,-)
> %doc docs/*
> 
> %files gui
>-%defattr(-,root,root,-)
> %{_bindir}/%{name}-gui
> %{_javadir}/%{name}/proguardgui.jar
>-%{_javadir}/%{name}/proguardgui-%{version}.jar
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/icons/*/*/apps/*
> 
> %changelog
>+* Tue Jan 07 2014 Michael Simacek <msimacek@redhat.com> - 4.11-2
>+- Adapt to current packaging guidelines (rhbz#1022159)
>+
> * Mon Dec 30 2013 FranÃ§ois Kooman <fkooman@tuxed.net> - 4.11-1
> - update to 4.11
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1022159: 846627