rpms/dbus-java/devel .cvsignore, 1.3, 1.4 dbus-java.spec, 1.5, 1.6 sources, 1.3, 1.4

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/dbus-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6207/devel

Modified Files:
	.cvsignore dbus-java.spec sources 
Log Message:
* Wed Jan 13 2010 Alexander Kurtakov <akurtako at redhat.com> 2.7-1
- Update to upstream 2.7.
- Drop gcj_support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Mar 2009 15:32:12 -0000	1.3
+++ .cvsignore	13 Jan 2010 14:11:12 -0000	1.4
@@ -1 +1,2 @@
 dbus-java-2.5.1.tar.gz
+dbus-java-2.7.tar.gz


Index: dbus-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/dbus-java.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dbus-java.spec	24 Jul 2009 20:02:33 -0000	1.5
+++ dbus-java.spec	13 Jan 2010 14:11:12 -0000	1.6
@@ -1,21 +1,15 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:       dbus-java
-Version:    2.5.1
-Release:    2%{?dist}
+Version:    2.7
+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
-# 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)
 
@@ -31,14 +25,7 @@ Requires:   java-1.6.0-openjdk
 Requires:   jpackage-utils
 Requires:   libmatthew-java
 
-%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
@@ -70,11 +57,8 @@ Javadocs for %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
 
 %build
 # no configure file
@@ -112,33 +96,10 @@ make install \
     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}
@@ -153,10 +114,6 @@ rm -rf $RPM_BUILD_ROOT
 %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,-)
@@ -164,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 13 2010 Alexander Kurtakov <akurtako at redhat.com> 2.7-1
+- Update to upstream 2.7.
+- Drop gcj_support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-java/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Mar 2009 15:32:12 -0000	1.3
+++ sources	13 Jan 2010 14:11:12 -0000	1.4
@@ -1 +1 @@
-1d1cb956a81be2168452cfea4912d613  dbus-java-2.5.1.tar.gz
+8b8470db5cd657591bac245e3b6e18e4  dbus-java-2.7.tar.gz