- added libsoup patch (libsoup-gnome part is not needed; kill gpsd copy/pastos from...

- separated -libs
- pl
- more complete deps

Changed files:
    geoclue-libsoup.patch -> 1.1
    geoclue.spec -> 1.15

diff --git a/geoclue-libsoup.patch b/geoclue-libsoup.patch
new file mode 100644 (file)
index 0000000..0cc0134
--- /dev/null
+++ b/geoclue-libsoup.patch
@@ -0,0 +1,25 @@
+--- geoclue-0.12.0/configure.ac.orig   2011-01-16 19:05:47.182364970 +0100
++++ geoclue-0.12.0/configure.ac        2011-01-16 19:19:19.978360779 +0100
+@@ -204,11 +204,10 @@
+ 
+ if test "x$enable_skyhook" != "xno"; then
+     PKG_CHECK_MODULES(SKYHOOK, [
+-                libsoup-gnome-2.4
++                libsoup-2.4
+     ], have_skyhook=yes, have_skyhook=no)
+ 
+    if test "x$have_skyhook" = "xyes"; then
+       PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS skyhook"
+-      GPSD_LIBS="-lgps"
+    else
+       NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS skyhook"
+    fi
+@@ -218,7 +217,7 @@
+ fi
+ 
+ if test "x$enable_skyhook" = "xyes" -a "x$have_skyhook" != "xyes"; then
+-   AC_MSG_ERROR([Couldn't find gpsd dependencies.])
++   AC_MSG_ERROR([Couldn't find skyhook dependencies.])
+ fi
+ AC_SUBST(SKYHOOK_LIBS)
+ AC_SUBST(SKYHOOK_CFLAGS)

diff --git a/geoclue.spec b/geoclue.spec
index 3d17944018cd9b688f2ed4a42c0fb24fe25b293c..660e67cb505d619f92cc3bcda418db1d1deaed3c 100644 (file)
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,31 +1,31 @@
-# git clone --depth 1 git://anongit.freedesktop.org/geoclue
-# cd geoclue
-# git archive master --prefix geoclue/ | bzip2 > geoclue-$(date +%Y%m%d).tar.bz2
-
 Summary:       A modular geoinformation service
+Summary(pl.UTF-8):     Modularna usługa geoinformacyjna
 Name:          geoclue
 Version:       0.12.0
-Release:       2
+Release:       3
 License:       LGPL v2
-Group:         Libraries
+Group:         Applications
 Source0:       http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 # Source0-md5: 33af8307f332e0065af056ecba65fec2
 Patch0:                %{name}-configure.patch
+Patch1:                %{name}-libsoup.patch
 URL:           http://geoclue.freedesktop.org/
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel >= 2.0
 BuildRequires: NetworkManager-devel
 BuildRequires: autoconf >= 2.59
-BuildRequires: automake
-BuildRequires: dbus-glib-devel
+BuildRequires: automake >= 1:1.9
+BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: docbook-dtd412-xml
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 1:2.0
 BuildRequires: gpsd-devel >= 2.91
-BuildRequires: gtk+2-devel
-BuildRequires: gtk-doc
+BuildRequires: gtk+2-devel >= 1:2.0
+BuildRequires: gtk-doc >= 1.0
 BuildRequires: gypsy-devel
-BuildRequires: libsoup-gnome-devel >= 2.4.0
+BuildRequires: libsoup-devel >= 2.4.0
 BuildRequires: libtool
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: libxslt-progs
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,61 +34,107 @@ Geoclue is a modular geoinformation service built on top of the D-Bus
 messaging system. The goal of the Geoclue project is to make creating
 location-aware applications as simple as possible.
 
+%description -l pl.UTF-8
+Geoclue to modularna usługa geoinformacyjna zbudowana w oparciu o
+system komunikacji D-Bus. Celem projektu jest jak największe
+ułatwienie tworzenia aplikacji uwzględniających lokalizację.
+
+%package libs
+Summary:       Geoclue modular geoinformation service library
+Summary(pl.UTF-8):     Biblioteka geoclue - modularnej usługi geoinformacyjnej
+Group:         Libraries
+Requires:      dbus-glib >= 0.60
+Conflicts:     geoclue < 0.12.0-3
+
+%description libs
+geoclue modular geoinformation service library.
+
+%description libs -l pl.UTF-8
+Biblioteka geoclue - modularnej usługi geoinformacyjnej.
+
 %package devel
 Summary:       Development package for geoclue
+Summary(pl.UTF-8):     Pakiet programistyczny geoclue
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      dbus-glib-devel
-Requires:      libxml2-devel
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      dbus-glib-devel >= 0.60
+Requires:      libxml2-devel >= 2.0
 
 %description devel
-Files for development with geoclue.
+Header files for development with geoclue.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do programowania z użyciem geoclue.
+
+%package static
+Summary:       Static geoclue library
+Summary(pl.UTF-8):     Statyczna biblioteka geoclue
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static geoclue library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka geoclue.
 
 %package apidocs
 Summary:       Developer documentation for geoclue
+Summary(pl.UTF-8):     Dokumentacja programisty do geoclue
 Group:         Development/Libraries
 Requires:      gtk-doc-common
 
 %description apidocs
-Developer documentation for geoclue
+Developer documentation for geoclue.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja programisty do geoclue.
 
 %package gpsd
 Summary:       gpsd provider for geoclue
-Group:         Development/Libraries
+Summary(pl.UTF-8):     Interfejs geoclue do gpsd
+Group:         Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      gpsd >= 2.91
 
 %description gpsd
-A gpsd provider for geoclue
+A gpsd provider for geoclue.
+
+%description gpsd -l pl.UTF-8
+Interfejs geoclue do gpsd.
 
 %package gypsy
 Summary:       gypsy provider for geoclue
-Group:         Development/Libraries
+Summary(pl.UTF-8):     Interfejs geoclue do gypsy
+Group:         Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      gypsy
 
 %description gypsy
-A gypsy provider for geoclue
+A gypsy provider for geoclue.
+
+%description gypsy -l pl.UTF-8
+Interfejs geoclue do gypsy.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
 %{__libtoolize}
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-       --disable-static \
        --enable-gtk-doc \
-       --enable-conic=no \
-       --enable-gpsd=yes \
-       --enable-gypsy=yes \
-       --enable-networkmanager=yes \
-       --enable-skyhook=yes \
+       --disable-conic \
+       --enable-gpsd \
+       --enable-gypsy \
+       --enable-networkmanager \
+       --enable-skyhook \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -102,15 +148,34 @@ rm -rf $RPM_BUILD_ROOT
 %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 README
+%attr(755,root,root) %{_libexecdir}/geoclue-example
+%attr(755,root,root) %{_libexecdir}/geoclue-geonames
+%attr(755,root,root) %{_libexecdir}/geoclue-gsmloc
+%attr(755,root,root) %{_libexecdir}/geoclue-hostip
+%attr(755,root,root) %{_libexecdir}/geoclue-localnet
+%attr(755,root,root) %{_libexecdir}/geoclue-manual
+%attr(755,root,root) %{_libexecdir}/geoclue-master
+%attr(755,root,root) %{_libexecdir}/geoclue-nominatim
+%attr(755,root,root) %{_libexecdir}/geoclue-plazes
+%attr(755,root,root) %{_libexecdir}/geoclue-skyhook
+%attr(755,root,root) %{_libexecdir}/geoclue-yahoo
 %dir %{_datadir}/geoclue-providers
-%attr(755,root,root) %{_libdir}/libgeoclue.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgeoclue.so.0
+%{_datadir}/geoclue-providers/geoclue-example.provider
+%{_datadir}/geoclue-providers/geoclue-geonames.provider
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/geoclue-providers/geoclue-hostip.provider
+%{_datadir}/geoclue-providers/geoclue-localnet.provider
+%{_datadir}/geoclue-providers/geoclue-manual.provider
+%{_datadir}/geoclue-providers/geoclue-nominatim.provider
+%{_datadir}/geoclue-providers/geoclue-plazes.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
+%{_datadir}/geoclue-providers/geoclue-yahoo.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service
@@ -122,27 +187,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
-%{_datadir}/geoclue-providers/geoclue-example.provider
-%{_datadir}/geoclue-providers/geoclue-geonames.provider
-%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
-%{_datadir}/geoclue-providers/geoclue-hostip.provider
-%{_datadir}/geoclue-providers/geoclue-localnet.provider
-%{_datadir}/geoclue-providers/geoclue-manual.provider
-%{_datadir}/geoclue-providers/geoclue-nominatim.provider
-%{_datadir}/geoclue-providers/geoclue-plazes.provider
-%{_datadir}/geoclue-providers/geoclue-skyhook.provider
-%{_datadir}/geoclue-providers/geoclue-yahoo.provider
-%attr(755,root,root) %{_libexecdir}/geoclue-example
-%attr(755,root,root) %{_libexecdir}/geoclue-geonames
-%attr(755,root,root) %{_libexecdir}/geoclue-gsmloc
-%attr(755,root,root) %{_libexecdir}/geoclue-hostip
-%attr(755,root,root) %{_libexecdir}/geoclue-localnet
-%attr(755,root,root) %{_libexecdir}/geoclue-manual
-%attr(755,root,root) %{_libexecdir}/geoclue-master
-%attr(755,root,root) %{_libexecdir}/geoclue-nominatim
-%attr(755,root,root) %{_libexecdir}/geoclue-plazes
-%attr(755,root,root) %{_libexecdir}/geoclue-skyhook
-%attr(755,root,root) %{_libexecdir}/geoclue-yahoo
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgeoclue.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgeoclue.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -151,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/geoclue
 %{_pkgconfigdir}/geoclue.pc
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgeoclue.a
+
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/geoclue