- geoclue2 under new name

diff --git a/geoclue-libsoup.patch b/geoclue-libsoup.patch
deleted file mode 100644 (file)
index e4a3afd..0000000
--- a/geoclue-libsoup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- geoclue-0.12.0/configure.ac.orig   2011-05-23 13:20:21.360568012 +0200
-+++ geoclue-0.12.0/configure.ac        2011-05-23 13:23:01.451330722 +0200
-@@ -204,12 +204,11 @@
- 
- 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
deleted file mode 100644 (file)
index eee00cb..0000000
--- a/geoclue.spec
+++ /dev/null
@@ -1,225 +0,0 @@
-%bcond_with    gps
-Summary:       A modular geoinformation service
-Summary(pl.UTF-8):     Modularna usługa geoinformacyjna
-Name:          geoclue
-Version:       0.12.99
-Release:       2
-License:       LGPL v2
-Group:         Applications
-Source0:       http://freedesktop.org/~hadess/%{name}-%{version}.tar.gz
-# Source0-md5: 779245045bfeeec4853da8baaa3a18e6
-Patch0:                %{name}-libsoup.patch
-URL:           http://geoclue.freedesktop.org/
-BuildRequires: GConf2-devel >= 2.0
-BuildRequires: NetworkManager-devel
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.9
-BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: docbook-dtd412-xml
-BuildRequires: glib2-devel >= 1:2.0
-%{?with_gps:BuildRequires:     gpsd-devel >= 2.91}
-BuildRequires: gtk+2-devel >= 1:2.0
-BuildRequires: gtk-doc >= 1.0
-BuildRequires: gypsy-devel
-BuildRequires: libsoup-devel >= 2.4.0
-BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.0
-BuildRequires: libxslt-progs
-Requires:      %{name}-libs = %{version}-%{release}
-Requires:      dbus
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-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}-libs = %{version}-%{release}
-Requires:      dbus-glib-devel >= 0.60
-Requires:      libxml2-devel >= 2.0
-
-%description devel
-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.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja programisty do geoclue.
-
-%package gpsd
-Summary:       gpsd provider for geoclue
-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.
-
-%description gpsd -l pl.UTF-8
-Interfejs geoclue do gpsd.
-
-%package gypsy
-Summary:       gypsy provider for geoclue
-Summary(pl.UTF-8):     Interfejs geoclue do gypsy
-Group:         Applications
-Requires:      %{name} = %{version}-%{release}
-Requires:      gypsy
-
-%description gypsy
-A gypsy provider for geoclue.
-
-%description gypsy -l pl.UTF-8
-Interfejs geoclue do gypsy.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --enable-gtk-doc \
-       --disable-conic \
-       --enable-gpsd%{?!with_gps:=no} \
-       --enable-gypsy \
-       --enable-networkmanager \
-       --enable-skyhook \
-       --with-html-dir=%{_gtkdocdir}
-
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%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
-%{_datadir}/GConf/gsettings/geoclue
-%{_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}/glib-2.0/schemas/org.freedesktop.Geoclue.gschema.xml
-%{_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
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Nominatim.service
-%{_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
-
-%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)
-%attr(755,root,root) %{_libdir}/libgeoclue.so
-%{_includedir}/geoclue
-%{_pkgconfigdir}/geoclue.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgeoclue.a
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/geoclue
-
-%if %{with gps}
-%files gpsd
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/geoclue-gpsd
-%{_datadir}/geoclue-providers/geoclue-gpsd.provider
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
-%endif
-
-%files gypsy
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/geoclue-gypsy
-%{_datadir}/geoclue-providers/geoclue-gypsy.provider
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service

diff --git a/geoclue2.spec b/geoclue2.spec
new file mode 100644 (file)
index 0000000..468c026
--- /dev/null
+++ b/geoclue2.spec
@@ -0,0 +1,92 @@
+Summary:       A modular geoinformation service
+Summary(pl.UTF-8):     Modularna usługa geoinformacyjna
+Name:          geoclue2
+Version:       1.99.2
+Release:       1
+License:       GPL v2+
+Group:         Applications
+Source0:       http://cgit.freedesktop.org/geoclue/snapshot/geoclue-%{version}.tar.gz
+# Source0-md5: 21551a387a9e5e3e5ebea11254f94a77
+URL:           http://geoclue.freedesktop.org/
+BuildRequires: GeoIP-devel >= 1.5.1
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: glib2-devel >= 1:2.34.0
+BuildRequires: json-glib-devel >= 0.14
+BuildRequires: libsoup-devel >= 2.4.0
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: pkgconfig >= 1:0.22
+BuildRequires: sed >= 4.0
+BuildRequires: yelp-tools
+Requires:      GeoIP >= 1.5.1
+Requires:      dbus
+Requires:      glib2 >= 1:2.34.0
+Requires:      json-glib >= 0.14
+Requires:      libsoup >= 2.4.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+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 devel
+Summary:       Development package for geoclue2
+Summary(pl.UTF-8):     Pakiet programistyczny geoclue2
+Group:         Development/Libraries
+# doesn't require base
+Requires:      glib2-devel >= 1:2.34.0
+Requires:      json-glib-devel >= 0.14
+Requires:      libsoup-devel >= 2.4.0
+
+%description devel
+Header files for development with geoclue2.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do programowania z użyciem geoclue2.
+
+%prep
+%setup -q -n geoclue-%{version}
+
+%{__sed} -i -e '/po\/Makefile.in/d' -e '/IT_PROG_INTLTOOL/d' configure.ac
+%{__sed} -i -e 's/ po$//' Makefile.am
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-silent-rules
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc NEWS README
+%attr(755,root,root) %{_bindir}/geoip-lookup
+%attr(755,root,root) %{_bindir}/geoip-update
+%attr(755,root,root) %{_libexecdir}/geoclue
+/etc/dbus-1/system.d/org.freedesktop.GeoClue2.conf
+%{_datadir}/geoclue-2.0
+%{_datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service
+
+%files devel
+%defattr(644,root,root,755)
+%{_pkgconfigdir}/geoclue-2.0.pc