rpms/dbus-java/devel docs.patch, NONE, 1.1 missing_test_signal_interface_2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dbus-java.spec, 1.3, 1.4 sources, 1.2, 1.3 docbook.patch, 1.1, NONE man_fixes.patch, 1.1, NONE
Omair Majid
omajid at fedoraproject.org
Tue Mar 17 15:32:43 UTC 2009
Author: omajid
Update of /cvs/pkgs/rpms/dbus-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25436
Modified Files:
.cvsignore dbus-java.spec sources
Added Files:
docs.patch missing_test_signal_interface_2.patch
Removed Files:
docbook.patch man_fixes.patch
Log Message:
* Tue Mar 17 2009 Omair Majid <omajid at redhat.com> - 2.5.1-1
- update to 2.5.1
- Added patches from François Kooman <fkooman at tuxed.net>
- Added docs.patch (already upstream). Replaces docbook.patch and
man_fixes.patch
- Add missing TestSignalInterface2 interface (already upstream)
docs.patch:
--- NEW FILE docs.patch ---
commit 3201f076de801ba502c63ded3a55972d65ea0aa0
Author: Matthew Johnson <mjj29 at qadesh.matthew.ath.cx>
Date: Fri Feb 20 21:54:14 2009 +0000
patches from Omair Majid <omajid at redhat.com>
diff --git a/DBusCall.sgml b/DBusCall.sgml
index 0b0456d..9efd4f0 100644
--- a/DBusCall.sgml
+++ b/DBusCall.sgml
@@ -61,7 +61,13 @@ manpage.1: manpage.sgml
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>&dhpackage;</command> <replaceable>dest</replaceable> <replaceable>path</replaceable> <replaceable>interface</replaceable> <replaceable>method</replaceable> <option><replaceable>sig</replaceable> <replaceable>args</replaceable></option>
+ <command>&dhpackage;</command>
+ <arg><replaceable>dest</replaceable></arg>
+ <arg><replaceable>path</replaceable></arg>
+ <arg><replaceable>interface</replaceable></arg>
+ <arg><replaceable>method</replaceable></arg>
+ <arg><option><replaceable>sig</replaceable></option></arg>
+ <arg><option><replaceable>args</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@@ -83,8 +89,6 @@ manpage.1: manpage.sgml
options is included below.
</para>
- <variablelist>
- </variablelist>
</refsect1>
<refsect1>
<title>AUTHOR</title>
diff --git a/Makefile b/Makefile
index 4b39270..72a23b9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ JAVADOC?=javadoc
JAR?=jar
MAKE?=make
MSGFMT?=msgfmt
+DOCBOOKTOMAN?=docbook-to-man
# Program parameters
CPFLAG?=-classpath
@@ -137,7 +138,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc
$(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/exceptions/*.java
%.1: %.sgml
- docbook-to-man $< > $@
+ $(DOCBOOKTOMAN) $< > $@
bin/%: %.sh .bin
sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@
missing_test_signal_interface_2.patch:
--- NEW FILE missing_test_signal_interface_2.patch ---
diff -urN a/org/freedesktop/dbus/test/TestSignalInterface2.java b/org/freedesktop/dbus/test/TestSignalInterface2.java
--- a/org/freedesktop/dbus/test/TestSignalInterface2.java 1970-01-01 01:00:00.000000000 +0100
+++ b/org/freedesktop/dbus/test/TestSignalInterface2.java 2009-03-15 16:30:20.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ D-Bus Java Implementation
+ Copyright (c) 2005-2006 Matthew Johnson
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of either the GNU Lesser General Public License Version 2 or the
+ Academic Free Licence Version 2.1.
+
+ Full licence texts are included in the COPYING file with this program.
+*/
+package org.freedesktop.dbus.test;
+
+import org.freedesktop.DBus.Description;
+import org.freedesktop.dbus.DBusInterface;
+import org.freedesktop.dbus.DBusInterfaceName;
+import org.freedesktop.dbus.DBusMemberName;
+import org.freedesktop.dbus.DBusSignal;
+import org.freedesktop.dbus.UInt32;
+import org.freedesktop.dbus.exceptions.DBusException;
+
+import java.util.List;
+
+/**
+ * A sample signal with two parameters
+ */
+ at Description("Test interface containing signals")
+ at DBusInterfaceName("some.other.interface.Name")
+public interface TestSignalInterface2 extends DBusInterface
+{
+ @Description("Test basic signal")
+ public static class TestRenamedSignal extends DBusSignal
+ {
+ public final String value;
+ public final UInt32 number;
+ /**
+ * Create a signal.
+ */
+ public TestRenamedSignal(String path, String value, UInt32 number) throws DBusException
+ {
+ super(path, value, number);
+ this.value = value;
+ this.number = number;
+ }
+ }
+}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Jul 2008 20:31:51 -0000 1.2
+++ .cvsignore 17 Mar 2009 15:32:12 -0000 1.3
@@ -1 +1 @@
-dbus-java-2.5.tar.gz
+dbus-java-2.5.1.tar.gz
Index: dbus-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/dbus-java.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dbus-java.spec 24 Feb 2009 11:02:49 -0000 1.3
+++ dbus-java.spec 17 Mar 2009 15:32:12 -0000 1.4
@@ -1,18 +1,21 @@
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: dbus-java
-Version: 2.5
-Release: 4%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
Summary: Java implementation of the DBus protocol
Group: Development/Libraries
License: AFL or LGPLv2
URL: http://freedesktop.org/wiki/Software/DBusBindings
#URL2: http://dbus.freedesktop.org/doc/dbus-java/
Source: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0: man_fixes.patch
-Patch1: docbook.patch
-Patch2: classpath_fix.patch
-Patch3: parallel.patch
+# patch already upstream
+Patch0: docs.patch
+Patch1: classpath_fix.patch
+# fedora specific paths
+Patch2: parallel.patch
+# patch already upstream
+Patch3: missing_test_signal_interface_2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +29,7 @@
Requires: java-1.6.0-openjdk
Requires: jpackage-utils
+Requires: libmatthew-java
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
@@ -75,6 +79,7 @@
%build
# no configure file
make %{?_smp_mflags} \
+ DOCBOOKTOMAN=docbook2man \
-j1 \
JARPREFIX=%{_javadir}/%{name} \
BINPREFIX=%{_bindir} \
@@ -159,6 +164,13 @@
%changelog
+* Tue Mar 17 2009 Omair Majid <omajid at redhat.com> - 2.5.1-1
+- update to 2.5.1
+- Added patches from François Kooman <fkooman at tuxed.net>
+- Added docs.patch (already upstream). Replaces docbook.patch and
+ man_fixes.patch
+- Add missing TestSignalInterface2 interface (already upstream)
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Jul 2008 20:31:51 -0000 1.2
+++ sources 17 Mar 2009 15:32:12 -0000 1.3
@@ -1 +1 @@
-0fa50b9d2bf5cb2f54e293acca9eb807 dbus-java-2.5.tar.gz
+1d1cb956a81be2168452cfea4912d613 dbus-java-2.5.1.tar.gz
--- docbook.patch DELETED ---
--- man_fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list