Attachment 877332 Details for Bug 1022150 – Update to current guidelines

[patch] Update to current guidelines

0001-Update-to-current-guidelines.patch (text/plain), 3.71 KB, created by Michael Simacek on 2014-03-21 15:17:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-03-21 15:17:41 UTC

Size: 3.71 KB

patch

obsolete

>From ae3803bc4b5b90e241dffefc7eb208ac4c3f9957 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Fri, 21 Mar 2014 16:00:53 +0100
>Subject: [PATCH] Update to current guidelines
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> opticalraytracer.spec | 44 ++++++++++++++------------------------------
> 1 file changed, 14 insertions(+), 30 deletions(-)
>
>diff --git a/opticalraytracer.spec b/opticalraytracer.spec
>index e309147..2f4bac8 100644
>--- a/opticalraytracer.spec
>+++ b/opticalraytracer.spec
>@@ -1,14 +1,12 @@
> Name:		opticalraytracer
> Version:	2.7
>-Release:	8%{?dist}
>+Release:	9%{?dist}
> Summary:	Utility that analyzes systems of lenses
> 
>-Group:		Amusements/Graphics    
> License:	GPLv2+	  
> URL:		http://arachnoid.com/OpticalRayTracer/index.html
> Source0:	http://arachnoid.com/OpticalRayTracer/OpticalRayTracer_source.tar.gz
> Source1:	%{name}.desktop
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch:	noarch
> 
> BuildRequires:	desktop-file-utils
>@@ -18,7 +16,6 @@ BuildRequires:	ant
> BuildRequires:	ant-junit
> 
> Requires:	java
>-Requires:	jpackage-utils
> 
> %description
> OpticalRayTracer is a X Window GUI-based utility that analyzes systems of 
>@@ -31,9 +28,6 @@ using the mouse.
> 
> %package javadoc
> Summary:		Javadocs for %{name}
>-Group:			Documentation
>-Requires:		%{name} = %{version}-%{release}
>-Requires:		jpackage-utils
> 
> %description javadoc
> This package contains the API documentation for %{name}.
>@@ -45,8 +39,6 @@ This package contains the API documentation for %{name}.
> ant 
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
> desktop-file-install \
> --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
> %{SOURCE1}
>@@ -54,41 +46,30 @@ desktop-file-install \
> install -D -p -m644 src/opticalraytracer/icons/OpticalRayTracer.png \
> $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/OpticalRayTracer.png
> 
>-mkdir -p $RPM_BUILD_ROOT%{_bindir}
>-cat > $RPM_BUILD_ROOT%{_bindir}/raytracer <<-EOF
>-	#!/bin/bash
>-	. /usr/share/java-utils/java-functions
>-	MAIN_CLASS=opticalraytracer.OpticalRayTracer
>-	set_classpath "%{name}-%{version}"
>-	run "$@"
>-EOF
>-chmod a+x $RPM_BUILD_ROOT%{_bindir}/raytracer
>+%jpackage_script opticalraytracer.OpticalRayTracer '' '' %{name} raytracer true
> 
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p dist/OpticalRayTracer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>+cp -p dist/OpticalRayTracer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> 
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -rp dist/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> %post
> touch --no-create %{_datadir}/icons/hicolor || :
>-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
>-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>-fi
> 
> %postun
>-touch --no-create %{_datadir}/icons/hicolor || :
>-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
>-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>+if [ $1 -eq 0 ] ; then
>+    touch --no-create %{_datadir}/icons/hicolor || :
>+    gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
> fi
> 
>+%posttrans
>+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
>+
>+
> %files
>-%defattr(-,root,root,-)
> %{_javadir}/*
> %{_bindir}/raytracer
> %{_datadir}/applications/*opticalraytracer.desktop
>@@ -96,11 +77,14 @@ fi
> %doc src/opticalraytracer/help_resources/*
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %{_javadocdir}/%{name}
> 
> 
> %changelog
>+* Fri Mar 21 2014 Michael Simacek <msimacek@redhat.com> - 2.7-9
>+- Update to current packaging guidelines
>+- Remove versioned symlink from javadir
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1022150: 877332