Attachment 846739 Details for Bug 1022171 – Adapt to current packaging guidelines and fix classpath

[patch] Adapt to current packaging guidelines and fix classpath

0001-Adapt-to-current-packaging-guidelines-rhbz-1022171.patch (text/plain), 2.93 KB, created by Michael Simacek on 2014-01-07 15:41:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-01-07 15:41:06 UTC

Size: 2.93 KB

patch

obsolete

>From a5e084aba13c085a569ef4a8337f8faec4db959f Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 7 Jan 2014 11:00:23 +0100
>Subject: [PATCH] Adapt to current packaging guidelines (rhbz#1022171)
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> xenserverjava-makefile.patch |  6 +++---
> xenserverjava.spec           | 21 ++++++++-------------
> 2 files changed, 11 insertions(+), 16 deletions(-)
>
>diff --git a/xenserverjava-makefile.patch b/xenserverjava-makefile.patch
>index f90adfa..f602f89 100644
>--- a/xenserverjava-makefile.patch
>+++ b/xenserverjava-makefile.patch
>@@ -3,10 +3,10 @@
> @@ -4,7 +4,7 @@
>  BINDINGCLASSFILES := $(BINDINGJAVAFILES:.java=.class)
>  BINDINGJAR := xenserver-5.6.100-1.jar
>- 
>+
> -CLASSPATH := :xmlrpc-client-3.1.jar:xmlrpc-common-3.1.jar:ws-commons-util-1.0.2.jar
>-+CLASSPATH := :/usr/share/java/xmlrpc3-client.jar:/usr/share/java/xmlrpc3-common.jar:/usr/share/java/ws-commons-util.jar
>++CLASSPATH := :/usr/share/java/xmlrpc-client.jar:/usr/share/java/xmlrpc-common.jar:/usr/share/java/ws-commons-util.jar
>  EXAMPLECLASSPATH := :$(BINDINGJAR)$(CLASSPATH)
>- 
>+
>  .PHONY: all
> 
>diff --git a/xenserverjava.spec b/xenserverjava.spec
>index 70d1d30..8c8a090 100644
>--- a/xenserverjava.spec
>+++ b/xenserverjava.spec
>@@ -1,14 +1,12 @@
> Name:		xenserverjava
> Version:	5.6.100.1
>-Release:	5%{?dist}
>+Release:	6%{?dist}
> Summary:	Java SDK for XenServer
> 
>-Group:		Development/Libraries
> License:	GPLv2 with exceptions
> URL:		http://citrix.com
> Source0:	http://community.citrix.com/download/attachments/38633496/XenServerJava-5.6.100-1-src.zip
> Patch0:		%{name}-makefile.patch
>-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
> BuildRequires:	java-devel >= 1:1.6.0 
> BuildRequires:	jpackage-utils
>@@ -29,7 +27,7 @@ XenServer Java SDK for utilizing the XML-RPC interface of XenServer.
> 
> %package javadoc
> Summary:	Javadoc for %{name}
>-Group:		Development/Libraries
>+Requires: jpackage-utils
> 
> %description javadoc
> Javadoc for %{name}
>@@ -44,31 +42,28 @@ make %{?_smp_mflags}
> make docs
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
> install -m 644 xenserver-5.6.100-1.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/xenserver-5.6.100-1.jar
>+  $RPM_BUILD_ROOT%{_javadir}/xenserver.jar
> 
> #javadoc
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -a doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
>-
> %files
>-%defattr(-,root,root,-)
>-%{_javadir}/xenserver-5.6.100-1.jar
>+%{_javadir}/xenserver.jar
> %doc README.txt LICENSE.txt GPL-2
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE.txt
> %{_javadocdir}/*
> 
> 
> %changelog
>+* Tue Jan 07 2014 Michael Simacek <msimacek@redhat.com> - 5.6.100.1-6
>+- Adapt to current packaging guidelines (rhbz#1022171)
>+- Fix compat symlink on classpath
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.100.1-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1022171: 846547 | 846739