rpms/dbus-java/F-9 classpath_fix.patch, NONE, 1.1 dbus-java.spec, NONE, 1.1 docbook.patch, NONE, 1.1 import.log, NONE, 1.1 man_fixes.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Omair Majid (omajid)
fedora-extras-commits at redhat.com
Fri Jul 4 20:40:12 UTC 2008
Author: omajid
Update of /cvs/pkgs/rpms/dbus-java/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516/F-9
Modified Files:
.cvsignore sources
Added Files:
classpath_fix.patch dbus-java.spec docbook.patch import.log
man_fixes.patch
Log Message:
* Fri Jul 4 2008 Omair Majid <omajid at redhat.com> - 2.5-2
- initial import into fedora
classpath_fix.patch:
--- NEW FILE classpath_fix.patch ---
>From 2ce75a5a3ad66129d25fba1120db2b3201a0833a Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid at redhat.com>
Date: Mon, 23 Jun 2008 10:39:22 -0400
Subject: [PATCH] fix Class-Path in manifest files
---
Makefile | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index e9e7639..baab50c 100644
--- a/Makefile
+++ b/Makefile
@@ -84,16 +84,16 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc
sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
libdbus-java-$(VERSION).jar: .classes
- echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
+ echo > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
dbus-java-test-$(VERSION).jar: .testclasses
- echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+ echo > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class)
dbus-java-viewer-$(VERSION).jar: .viewerclasses
- echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+ echo > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/viewer/*.class)
dbus-java-bin-$(VERSION).jar: .binclasses
- echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
+ echo > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/bin/*.class)
dbus.jar: libdbus-java-$(VERSION).jar
ln -sf $< $@
--
1.5.5.1
--- NEW FILE dbus-java.spec ---
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: dbus-java
Version: 2.5
Release: 2%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-1.6.0-openjdk-devel
BuildRequires: jpackage-utils
BuildRequires: texlive-latex
BuildRequires: tetex-tex4ht
BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: libmatthew-java
Requires: java-1.6.0-openjdk
Requires: jpackage-utils
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch: noarch
%endif
%description
D-Bus is a message bus system, a simple way for applications to
talk to one another. In addition to interprocess communication,
D-Bus helps coordinate process lifecycle; it makes it simple and
reliable to code a "single instance" application or daemon, and to
launch applications and daemons on demand when their services are
needed.
This is a complete independent implementation of the D-Bus protocol
in Java. It comprises a library to write programs in Java which
access D-Bus, a tool for generating stubs from D-Bus introspection
data and a simple daemon. Being written in Java it works on both
Windows and Linux (and other Unix-like systems).
When using a TCP transport it is entirely Java-based; when using
Unix-sockets it requires a small JNI library to use Unix-Sockets.
%package javadoc
Summary: Javadocs for %{name}
Group: Development/Libraries
Requires: jpackage-utils
%description javadoc
Javadocs for %{name}
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
# no configure file
make %{?_smp_mflags} \
JARPREFIX=%{_javadir}/%{name} \
BINPREFIX=%{_bindir} \
MANPREFIX=%{_mandir}/man1 \
DOCPREFIX=%{_defaultdocdir}/%{name} \
JAVADOCPREFIX=%{_javadocdir}/%{name} \
JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \
JAVAUNIXJARDIR=%{_libdir}/libmatthew-java
%check
make check \
JARPREFIX=%{_javadir}/%{name} \
BINPREFIX=%{_bindir} \
MANPREFIX=%{_mandir}/man1 \
DOCPREFIX=%{_defaultdocdir}/%{name} \
JAVADOCPREFIX=%{_javadocdir}/%{name} \
JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \
JAVAUNIXJARDIR=%{_libdir}/libmatthew-java
%install
rm -rf $RPM_BUILD_ROOT
make install \
DESTDIR=$RPM_BUILD_ROOT \
JARPREFIX=%{_javadir}/%{name} \
BINPREFIX=%{_bindir} \
MANPREFIX=%{_mandir}/man1 \
DOCPREFIX=%{_defaultdocdir}/%{name} \
JAVADOCPREFIX=%{_javadocdir}/%{name} \
JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \
JAVAUNIXJARDIR=%{_libdir}/libmatthew-java
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif
%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_bindir}/CreateInterface
%{_bindir}/DBusCall
%{_bindir}/DBusDaemon
%{_bindir}/DBusViewer
%{_bindir}/ListDBus
%doc %{_defaultdocdir}/%{name}
%doc %{_mandir}/man1/CreateInterface.1.gz
%doc %{_mandir}/man1/DBusCall.1.gz
%doc %{_mandir}/man1/DBusDaemon.1.gz
%doc %{_mandir}/man1/DBusViewer.1.gz
%doc %{_mandir}/man1/ListDBus.1.gz
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
* Mon Jun 30 2008 Omair Majid <omajid at redhat.com> - 2.5-2
- fixed incoherent name warning from rpmlint
- fixed wrapper script paths
- added check section
* Wed Jun 25 2008 Omair Majid <omajid at redhat.com> - 2.5-1
- Initial build
docbook.patch:
--- NEW FILE docbook.patch ---
commit 7e9e0252b50e8972b6666e39782129d953a4c377
Author: Omair Majid <omajid at toddler.yyz.redhat.com>
Date: Fri Jun 20 12:08:01 2008 -0400
fixed docbook command for fedora
diff --git a/Makefile b/Makefile
index 664413c..b474ccf 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,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 $< > $@
+ docbook2man $< > $@
bin/%: %.sh .bin
sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@
--- NEW FILE import.log ---
dbus-java-2_5-2_fc9:F-9:dbus-java-2.5-2.fc9.src.rpm:1215203883
man_fixes.patch:
--- NEW FILE man_fixes.patch ---
commit 70874613bf3b592b1092d6d69c0325adf40265a4
Author: Omair Majid <omajid at toddler.yyz.redhat.com>
Date: Thu Jun 19 13:31:53 2008 -0400
doc fixes to the docbook manual
diff --git a/DBusCall.sgml b/DBusCall.sgml
index f485f1b..350e3fd 100644
--- a/DBusCall.sgml
+++ b/DBusCall.sgml
@@ -61,7 +61,7 @@ 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;<replaceable>dest</replaceable> <replaceable>path</replaceable> <replaceable>interface</replaceable> <replaceable>method</replaceable> <option><replaceable>sig</replaceable> <replaceable>args</replaceable></option></command>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@@ -83,9 +83,7 @@ manpage.1: manpage.sgml
options is included below.
</para>
- <variablelist>
- </variablelist>
- </refsect1>
+ </refsect1>
<refsect1>
<title>AUTHOR</title>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Jul 2008 20:22:08 -0000 1.1
+++ .cvsignore 4 Jul 2008 20:39:00 -0000 1.2
@@ -0,0 +1 @@
+dbus-java-2.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Jul 2008 20:22:08 -0000 1.1
+++ sources 4 Jul 2008 20:39:00 -0000 1.2
@@ -0,0 +1 @@
+0fa50b9d2bf5cb2f54e293acca9eb807 dbus-java-2.5.tar.gz
More information about the fedora-extras-commits
mailing list