[dbus-java] Install only verison-less jars

Omair Majid omajid at fedoraproject.org
Mon Nov 18 22:24:53 UTC 2013


commit c06bcd7fcb46f99e1d002ea699fb76851ac160f9
Author: Omair Majid <omajid at redhat.com>
Date:   Mon Nov 18 17:25:08 2013 -0500

    Install only verison-less jars

 dbus-java.spec          |    7 ++++++-
 version-less-jars.patch |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/dbus-java.spec b/dbus-java.spec
index 6cda00f..18e7891 100644
--- a/dbus-java.spec
+++ b/dbus-java.spec
@@ -4,7 +4,7 @@
 
 Name:       dbus-java
 Version:    2.7
-Release:    14%{?dist}
+Release:    15%{?dist}
 Summary:    Java implementation of the DBus protocol
 Group:      Development/Libraries
 License:    AFL or LGPLv2
@@ -21,6 +21,7 @@ Patch2:     parallel.patch
 # java-7 compatibility patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=44791
 Patch3:     utf-8-encoding.patch
+Patch4:     version-less-jars.patch
 
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
@@ -79,6 +80,7 @@ Javadocs for %{name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i "s|!doctype|!DOCTYPE|g" *.sgml
 sed -i 's|<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"|<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"|g' *.sgml
@@ -142,6 +144,9 @@ make install \
 
 
 %changelog
+* Mon Nov 18 2013 Omair Majid <omajid at redhat.com> - 2.7-15
+- Install only version-less jars
+
 * Mon Aug 05 2013 Omair Majid <omajid at redhat.com> - 2.7-14
 - Fixed paths to jni jars
 
diff --git a/version-less-jars.patch b/version-less-jars.patch
new file mode 100644
index 0000000..09d5eb0
--- /dev/null
+++ b/version-less-jars.patch
@@ -0,0 +1,19 @@
+diff -ruN dbus-java-2.7.orig/Makefile dbus-java-2.7/Makefile
+--- dbus-java-2.7.orig/Makefile	2013-11-15 20:49:00.988601756 -0500
++++ dbus-java-2.7/Makefile	2013-11-18 15:53:03.027564517 -0500
+@@ -255,12 +255,9 @@
+ 
+ install-bin: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar bin/CreateInterface bin/ListDBus bin/DBusViewer bin/DBusDaemon dbus-java-bin-$(VERSION).jar bin/DBusCall
+ 	install -d $(DESTDIR)$(JARPREFIX)
+-	install -m 644 libdbus-java-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-$(VERSION).jar
+-	install -m 644 dbus-java-viewer-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-viewer-$(VERSION).jar
+-	install -m 644 dbus-java-bin-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-bin-$(VERSION).jar
+-	ln -sf dbus-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus.jar
+-	ln -sf dbus-viewer-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-viewer.jar
+-	ln -sf dbus-bin-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-bin.jar
++	install -m 644 libdbus-java-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus.jar
++	install -m 644 dbus-java-viewer-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-viewer.jar
++	install -m 644 dbus-java-bin-$(VERSION).jar $(DESTDIR)$(JARPREFIX)/dbus-bin.jar
+ 	install -d $(DESTDIR)$(BINPREFIX)
+ 	install bin/DBusViewer $(DESTDIR)$(BINPREFIX)
+ 	install bin/DBusCall $(DESTDIR)$(BINPREFIX)


More information about the scm-commits mailing list