Browse Source

geoclue: remove BR: gpsd-devel
others: rebuild with gpsd-3.15

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9716 ec354946-7b23-47d6-9f5a-488ba84defc7

Takemikaduchi 8 years ago
parent
commit
12a0e0db65
3 changed files with 24 additions and 13 deletions
  1. 16 11
      g/geoclue/geoclue-vl.spec
  2. 4 1
      k/kdebase-workspace/kdebase-workspace-vl.spec
  3. 4 1
      m/marble/marble-vl.spec

+ 16 - 11
g/geoclue/geoclue-vl.spec

@@ -3,15 +3,13 @@ Summary(ja):    モジュール型地理情報サービス
 
 Name:           geoclue
 Version:        0.12.99
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 Source0:        http://freedesktop.org/~hadess/%{name}-%{version}.tar.gz
 
-Patch0:			geoclue-0.12.99-gpsd.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: dbus-devel
@@ -22,7 +20,6 @@ BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
-BuildRequires: gpsd-devel
 BuildRequires: libsoup-devel
 
 #Needed for NetworkManager patch
@@ -30,6 +27,8 @@ BuildRequires: libtool
 
 Requires: dbus
 
+Obsoletes: %{name}-gpsd < 0.12.99-5
+
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -80,11 +79,17 @@ A gypsy provider for geoclue
 
 %prep
 %setup -q
-%patch0 -p0 -b .gpsd
 
 %build
 autoreconf -if
-%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
+%configure \
+	--disable-static \
+	--enable-gtk-doc \
+	--enable-networkmanager=yes \
+	--enable-gypsy=yes \
+	--enable-skyhook=yes \
+	--enable-gsmloc=yes \
+	--disable-gpsd
 make %{?_smp_mflags} V=1
 
 %install
@@ -161,17 +166,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files gui
 %{_bindir}/geoclue-test-gui
 
-%files gpsd
-%{_libexecdir}/geoclue-gpsd
-%{_datadir}/geoclue-providers/geoclue-gpsd.provider
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
-
 %files gypsy
 %{_libexecdir}/geoclue-gypsy
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
+* Sun Aug 23 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.99-5
+- remove Patch0 (geoclue-0.12.99-gpsd.patch)
+- remove BuildRequiers: gpsd-devel
+- remove %%{name}-gpsd subpackage
+
 * Sun Dec 07 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.99-4
 - rebuild with gpsd-3.11
 

+ 4 - 1
k/kdebase-workspace/kdebase-workspace-vl.spec

@@ -6,7 +6,7 @@ Name: kdebase-workspace
 Summary: KDE Workspace
 Summary(ja): KDE ワークスペース
 Version: 4.11.14
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -690,6 +690,9 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Sun Aug 23 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.14-2
+- rebuilt with gpsd 3.15
+
 * Wed Dec 31 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.14-1
 - new upstream release
 

+ 4 - 1
m/marble/marble-vl.spec

@@ -2,7 +2,7 @@ Name: marble
 Summary: A World Atlas
 Summary(ja): デスクトップ地球儀
 Version: 4.14.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 # documents are GFDL
 License: LGPLv2+ and GFDLv1.2
@@ -180,6 +180,9 @@ fi
 %{_datadir}/kde4/apps/cmake/modules/
 
 %changelog
+* Sun Aug 23 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.14.3-2
+- rebuild with gpsd-3.15
+
 * Thu Jan 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.14.3-1
 - new upstream release