rpms/openobex/F-10 .cvsignore, 1.6, 1.7 openobex-1.3-autoconf.patch, 1.1, 1.2 openobex-1.3-push.patch, 1.2, 1.3 openobex.spec, 1.34, 1.35 sources, 1.6, 1.7

[Jiří Moskovčák]

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14692

Modified Files:
	.cvsignore openobex-1.3-autoconf.patch openobex-1.3-push.patch 
	openobex.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openobex/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jun 2006 13:16:38 -0000	1.6
+++ .cvsignore	19 Nov 2008 15:40:12 -0000	1.7
@@ -1 +1 @@
-openobex-1.3.tar.gz
+openobex-1.4.tar.gz

openobex-1.3-autoconf.patch:

Index: openobex-1.3-autoconf.patch
===================================================================
RCS file: /cvs/extras/rpms/openobex/F-10/openobex-1.3-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openobex-1.3-autoconf.patch	26 Oct 2007 13:52:21 -0000	1.1
+++ openobex-1.3-autoconf.patch	19 Nov 2008 15:40:12 -0000	1.2
@@ -1,11 +1,11 @@
---- openobex-1.3/acinclude.m4~	2006-06-14 12:11:47.000000000 +0300
-+++ openobex-1.3/acinclude.m4	2007-03-24 16:39:44.000000000 +0200
-@@ -128,7 +128,7 @@
- 
- 	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
- 		AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
--		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
+--- openobex-1.4/acinclude.m4.old	2008-11-07 13:36:09.000000000 +0100
++++ openobex-1.4/acinclude.m4	2008-11-18 14:39:41.000000000 +0100
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
 +		AC_CHECK_FILE(${libdir}/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
- 	fi
- 
- 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)

openobex-1.3-push.patch:

Index: openobex-1.3-push.patch
===================================================================
RCS file: /cvs/extras/rpms/openobex/F-10/openobex-1.3-push.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openobex-1.3-push.patch	23 Mar 2007 13:02:45 -0000	1.2
+++ openobex-1.3-push.patch	19 Nov 2008 15:40:12 -0000	1.3
@@ -260,16 +260,16 @@
  
  obex_test_SOURCES = \
  	obex_test.c obex_test.h \
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,11 @@
  
- obex_test_LDADD = $(top_builddir)/lib/libopenobex.la @BLUEZ_LIBS@ @USB_LIBS@ libmisc.a
+ obex_test_LDADD = libmisc.a $(top_builddir)/lib/libopenobex.la @BLUETOOTH_LIBS@
  
 +obex_push_SOURCES = obex_push.c
-+obex_push_LDADD = $(top_builddir)/lib/libopenobex.la @BLUEZ_LIBS@ @USB_LIBS@ libmisc.a
++obex_push_LDADD = $(top_builddir)/lib/libopenobex.la @BLUETOOTH_LIBS@ @USB_LIBS@ libmisc.a
 +
 +man_MANS = obex_push.1
 +
-+
- LDADD = $(top_builddir)/lib/libopenobex.la libmisc.a
+ AM_CFLAGS = @OPENOBEX_CFLAGS@
+ 
+ LDADD = libmisc.a $(top_builddir)/lib/libopenobex.la
  
- INCLUDES = @USB_CFLAGS@ @BLUEZ_CFLAGS@ -I$(top_builddir)/include


Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/F-10/openobex.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openobex.spec	2 Oct 2008 14:30:04 -0000	1.34
+++ openobex.spec	19 Nov 2008 15:40:12 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
-Version: 1.3
-Release: 15%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -9,9 +9,7 @@
 Patch: openobex-apps-flush.patch
 Patch1: openobex-1.3-push.patch
 Patch2: openobex-1.3-autoconf.patch
-Patch3: openobex-1.3-ipv6.patch
-Patch4: openobex-1.3-utf.patch
-Patch5: openobex-1.3-ircp.patch
+Patch3: openobex-1.3-ircp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.57, bluez-libs-devel, sed, libusb-devel
@@ -45,10 +43,8 @@
 %setup -q
 %patch -p1 -b .flush
 %patch1 -p1 -b .push
-%patch2 -p1 -b .ipv6
-%patch3 -p1 -b .autoconf
-%patch4 -p1 -b .utf
-%patch5 -p1 -b .ircp
+%patch2 -p1 -b .autoconf
+%patch3 -p1 -b .ircp
 autoreconf --install --force
 
 %build
@@ -76,7 +72,6 @@
 %files devel
 %defattr(-, root, root)
 %{_libdir}/libopenobex*.so
-%{_datadir}/aclocal/openobex.m4
 %dir %{_includedir}/openobex
 %{_includedir}/openobex/*.h
 %{_libdir}/pkgconfig/openobex.pc
@@ -93,6 +88,11 @@
 
 
 %changelog
+* Tue Nov 18 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.4.1
+- New upstream version
+- Spec file cleanup
+- Removed unneeded patches
+
 * Thu Oct  2 2008 Jiri Moskovcak <jmoskovc>@redhat.com> 1.3.15
 - rebuilt against new bluez-libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openobex/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jun 2006 13:16:38 -0000	1.6
+++ sources	19 Nov 2008 15:40:12 -0000	1.7
@@ -1 +1 @@
-feaa5dfe5151c0e70e8f868fa4648a43  openobex-1.3.tar.gz
+572a52ac423434a3290c5f867eed362d  openobex-1.4.tar.gz