packages: gypsy/gypsy.spec, gypsy/gypsy-link.patch (NEW) - closer to PLD st...

qboosh qboosh at pld-linux.org
Sun Jan 16 11:06:00 CET 2011 

Author: qboosh                       Date: Sun Jan 16 10:06:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- closer to PLD standard
- updated to 0.8
- added link patch (link only daemon with libbluetooth)
- pl
- separated -libs (no running daemons for development)
- release 0.1 (--with-user should be different than default root)

---- Files affected:
packages/gypsy:
   gypsy.spec (1.2 -> 1.3) , gypsy-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gypsy/gypsy.spec
diff -u packages/gypsy/gypsy.spec:1.2 packages/gypsy/gypsy.spec:1.3
--- packages/gypsy/gypsy.spec:1.2	Sun Nov 15 12:48:46 2009
+++ packages/gypsy/gypsy.spec	Sun Jan 16 11:05:54 2011
@@ -1,21 +1,29 @@
 # $Revision$, $Date$
+# TODO:
+# - --with-user= (not root!) - is nobody OK, or some more specific user required?
+# - gpsbt? (libgpsbt from Nokia?)
 Summary:	Gypsy - a GPS multiplexing daemon
+Summary(pl.UTF-8):	Gypsy - demon przełączający dostęp do GPS
 Name:		gypsy
-Version:	0.7
-Release:	1
-Source0:	http://gypsy.freedesktop.org/gypsy-releases/%{name}-%{version}.tar.gz
-# Source0-md5:	cde52c121693014efa75d9098fd7de22
-Group:		Libraries
-# See LICENSE file for details
-License:	LGPLv2 and GPLv2
+Version:	0.8
+Release:	0.1
+License:	LGPL v2+ (library), GPL v2+ (daemon)
+Group:		Daemons
+Source0:	http://gypsy.freedesktop.org/releases/%{name}-%{version}.tar.gz
+# Source0-md5:	32b8db24db86d2dac87b391dd255f4bf
+Patch0:		%{name}-link.patch
 URL:		http://gypsy.freedesktop.org/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	bluez-libs-devel
 BuildRequires:	dbus-devel
-BuildRequires:	dbus-glib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gtk-doc
-BuildRequires:	libxslt
+BuildRequires:	dbus-glib-devel >= 0.60
+BuildRequires:	glib2-devel >= 1:2.0
+BuildRequires:	gtk-doc >= 1.6
+BuildRequires:	libtool
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,31 +31,70 @@
 Gypsy is a GPS multiplexing daemon which allows multiple clients to
 access GPS data from multiple GPS sources concurrently.
 
+%description -l pl.UTF-8
+Gypsy to demon multipleksujący GPS, pozwalający wielu klientom na
+naprzemienny dostęp do danych GPS z wielu źródeł.
+
+%package libs
+Summary:	Gypsy library
+Summary(pl.UTF-8):	Biblioteka gypsy
+Group:		Libraries
+
+%description libs
+Gypsy GPS multiplexing library.
+
+%description libs -l pl.UTF-8
+Biblioteka gypsy multipleksująca dostęp do usługi GPS.
+
 %package devel
 Summary:	Development package for gypsy
+Summary(pl.UTF-8):	Pakiet programistyczny gypsy
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	dbus-glib-devel
-Requires:	pkgconfig
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dbus-glib-devel >= 0.60
 
 %description devel
 Header files for development with gypsy.
 
-%package apidocs
-Summary:	Documentation files for %{name}
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do programowania z użyciem gypsy
+
+%package static
+Summary:	Static gypsy library
+Summary(pl.UTF-8):	Statyczna biblioteka gypsy
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtk-doc
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static gypsy library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka gypsy.
+
+%package apidocs
+Summary:	Gypsy API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki gypsy
+Group:		Documentation
+Requires:	gtk-doc-common
 
 %description apidocs
-This package contains developer documentation for %{name}.
+This package contains developer documentation for gypsy.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja programisty do gypsy.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--disable-static \
+	--disable-silent-rules \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -60,28 +107,35 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING COPYING.lib LICENSE
+%attr(755,root,root) %{_libexecdir}/gypsy-daemon
 /etc/dbus-1/system.d/Gypsy.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.Gypsy.service
-%{_libexecdir}/gypsy-daemon
+
+%files libs
+%defattr(644,root,root,755)
+%doc AUTHORS LICENSE NEWS TODO
 %attr(755,root,root) %{_libdir}/libgypsy.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgypsy.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%{_pkgconfigdir}/gypsy.pc
-%{_includedir}/gypsy
-%{_libdir}/libgypsy.so
+%attr(755,root,root) %{_libdir}/libgypsy.so
 %{_libdir}/libgypsy.la
+%{_includedir}/gypsy
+%{_pkgconfigdir}/gypsy.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgypsy.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%doc %{_gtkdocdir}/gypsy
+%{_gtkdocdir}/gypsy
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,6 +143,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/01/16 10:05:54  qboosh
+- closer to PLD standard
+- updated to 0.8
+- added link patch (link only daemon with libbluetooth)
+- pl
+- separated -libs (no running daemons for development)
+- release 0.1 (--with-user should be different than default root)
+
 Revision 1.2  2009/11/15 11:48:46  zbyniu
 - BR: pkgconfig
 

================================================================
Index: packages/gypsy/gypsy-link.patch
diff -u /dev/null packages/gypsy/gypsy-link.patch:1.1
--- /dev/null	Sun Jan 16 11:06:00 2011
+++ packages/gypsy/gypsy-link.patch	Sun Jan 16 11:05:54 2011
@@ -0,0 +1,21 @@
+--- gypsy-0.8/src/Makefile.am.orig	2010-06-09 17:18:54.000000000 +0200
++++ gypsy-0.8/src/Makefile.am	2011-01-16 10:37:42.590362455 +0100
+@@ -10,6 +10,7 @@ gypsy_daemon_CFLAGS =		\
+ 
+ gypsy_daemon_LDADD =		\
+ 	$(GYPSY_LIBS)		\
++	$(BLUEZ_LIBS)		\
+ 	$(GPSBT_LIBS)		\
+ 	-lm
+ 
+--- gypsy-0.8/configure.ac.orig	2010-06-09 16:58:03.000000000 +0200
++++ gypsy-0.8/configure.ac	2011-01-16 10:38:38.518356589 +0100
+@@ -16,7 +16,7 @@ AC_ARG_ENABLE(bluetooth, AC_HELP_STRING(
+ 
+ if test x$enable_bluetooth = xyes; then
+ 	AC_DEFINE(HAVE_BLUEZ,1,[Define if we have Bluez])
+-	GYPSY_PC_MODULES="$GYPSY_PC_MODULES bluez"
++	PKG_CHECK_MODULES(BLUEZ, [bluez])
+ fi
+ 
+ AC_ARG_ENABLE(n810, AC_HELP_STRING([--enable-n810],[Enable support for Nokia N810 internal GPS]), ENABLE_N810=yes,)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gypsy/gypsy.spec?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list