rpms/openobex/devel openobex-1.3-push.patch, 1.1, 1.2 openobex.spec, 1.21, 1.22

Fri Mar 23 13:02:47 UTC 2007

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29015

Modified Files:
	openobex-1.3-push.patch openobex.spec 
Log Message:
specfile cleanup

openobex-1.3-push.patch:
 apps/Makefile.am |    8 ++
 apps/obex_push.1 |   26 ++++++++
 apps/obex_push.c |  177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/obex_push.1  |   39 ++++++++++++
 4 files changed, 249 insertions(+), 1 deletion(-)

Index: openobex-1.3-push.patch
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex-1.3-push.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- openobex-1.3-push.patch	7 Feb 2007 08:22:46 -0000	1.1
+++ openobex-1.3-push.patch	23 Mar 2007 13:02:45 -0000	1.2
@@ -1,5 +1,5 @@
 --- /dev/null	2007-02-06 15:45:45.046837255 +0100
-+++ openobex-1.3/src/obex_push.1	2007-02-07 09:12:30.000000000 +0100
++++ openobex-1.3/src/obex_push.1	2007-02-07 09:21:04.000000000 +0100
 @@ -0,0 +1,39 @@
 +.TH OBEX_PUSH 1 "04 June 2003" "1.0.0"  "openobex-apps"
 +.SH NAME
@@ -41,7 +41,7 @@
 +.SH AUTHOR
 +Harald Hoyer \fI<harald at redhat.com>\fR
 --- /dev/null	2007-02-06 15:45:45.046837255 +0100
-+++ openobex-1.3/apps/obex_push.c	2007-02-07 09:12:30.000000000 +0100
++++ openobex-1.3/apps/obex_push.c	2007-02-07 09:36:56.000000000 +0100
 @@ -0,0 +1,177 @@
 +/*********************************************************************
 + *                
@@ -53,8 +53,8 @@
 + *
 + *     modified irobex_palm3.c
 + * 
-+ *     Copyright (C) 2003 Harald Hoyer, All Rights Reserved.
-+ *     Copyright (C) 2003 Red Hat, Inc.
++ *     Copyright (C) 2003-2007 Harald Hoyer, All Rights Reserved.
++ *     Copyright (C) 2003-2007 Red Hat, Inc.
 + *     
 + *     This program is free software; you can redistribute it and/or 
 + *     modify it under the terms of the GNU General Public License as 
@@ -220,8 +220,8 @@
 +//	sleep(1);
 +	return exitval;
 +}
---- openobex-1.3/apps/obex_push.1.push	2007-02-07 09:16:05.000000000 +0100
-+++ openobex-1.3/apps/obex_push.1	2007-02-07 09:19:25.000000000 +0100
+--- /dev/null	2007-02-06 15:45:45.046837255 +0100
++++ openobex-1.3/apps/obex_push.1	2007-02-07 09:21:04.000000000 +0100
 @@ -0,0 +1,26 @@
 +.TH OBEX_PUSH 1 "07 Feb 2007" "1.0.0"  "openobex-apps"
 +.SH NAME
@@ -250,7 +250,7 @@
 +.SH AUTHOR
 +Harald Hoyer \fI<harald at redhat.com>\fR
 --- openobex-1.3/apps/Makefile.am.push	2006-01-03 19:36:15.000000000 +0100
-+++ openobex-1.3/apps/Makefile.am	2007-02-07 09:12:30.000000000 +0100
++++ openobex-1.3/apps/Makefile.am	2007-02-07 09:21:04.000000000 +0100
 @@ -6,7 +6,7 @@
  	obex_io.c obex_io.h \
  	obex_put_common.c obex_put_common.h


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openobex.spec	7 Feb 2007 08:22:46 -0000	1.21
+++ openobex.spec	23 Mar 2007 13:02:45 -0000	1.22
@@ -1,15 +1,15 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 4
-License: LGPL
+Release: 5%{?dist}
+License: GPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
 Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz
 Patch: openobex-apps-flush.patch
 Patch1: openobex-1.3-push.patch
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed, libusb-devel
 BuildRequires: automake autoconf libtool
 ExcludeArch: s390 s390x
@@ -20,7 +20,8 @@
 %package devel
 Summary: Files for development of applications which will use OBEX
 Group: Development/Libraries
-Requires: %{name} = 0:%{version}-%{release} bluez-libs-devel libusb-devel pkgconfig
+Requires: %{name} = %{version}-%{release} 
+Requires: bluez-libs-devel libusb-devel pkgconfig
 
 %description devel
 Open OBEX shared c-library
@@ -36,8 +37,6 @@
 Open OBEX Applications
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 %patch -p1 -b .flush
 %patch1 -p1 -b .push
@@ -45,8 +44,8 @@
 %build
 autoreconf --install --force
 %configure --disable-static --enable-apps --enable-usb
-make
-make -C doc 
+make %{?_smp_mflags}
+make -C doc %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,11 +62,12 @@
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS COPYING COPYING.LIB ChangeLog README 
 %{_libdir}/libopenobex*.so.*
 
 %files devel
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%doc AUTHORS COPYING COPYING.LIB ChangeLog README 
 %{_libdir}/libopenobex*.so
 %{_datadir}/aclocal/openobex.m4
 %dir %{_includedir}/openobex
@@ -76,7 +76,7 @@
 
 %files apps
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING COPYING.LIB ChangeLog README 
 %{_bindir}/irobex_palm3
 %{_bindir}/irxfer
 %{_bindir}/ircp
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Fri Mar 23 2007 Harald Hoyer <harald at redhat.com> - 1.3-5%{?dist}
+- specfile cleanup
+
 * Wed Feb  7 2007 Harald Hoyer <harald at redhat.com> - 1.3-4
 - readded obex_push
 


