new upstream release

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

W/WebKit/WebKit-vl.spec

@@ -11,16 +11,12 @@
 #%bcond_with	jit
 # --with pango : use pango for font rendering instead of freetype2 (default: use freetype2)
 %bcond_with	pango
-# --with libsoup : use libsoup for HTTP backend instead of cURL (default: no)
-%bcond_with	libsoup
-# --with svg : experimental svg support (default: no)
-%bcond_with	svg
 # --with wml: Build support for WML
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.2.0
+Version:	1.2.3
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
 
@@ -64,12 +60,7 @@ BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 %endif
 
-%if %{with libsoup}
+BuildRequires:  libsoup-devel >= 2.28.2
-BuildRequires:  libsoup-devel >= 2.23
-%else
-BuildRequires:  curl-devel
-%endif
-
 
 
 %description 
@@ -93,6 +84,7 @@ Group:		Development/Libraries
 Requires:	%{name}-gtk = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gtk2-devel
+Requires:	libsoup-devel >= 2.28.2
 
 %description	gtk-devel
 The %{name}-gtk-devel package contains libraries, build data, and header
@@ -116,17 +108,14 @@ AUTHORS files.
 %setup -q -n webkit-%{version}
 
 # upstream
-%patch100 -p0
+## %patch100 -p0
 
 %build
 %configure \
 --enable-icon-database \
---enable-gnome-keyring \
 --enable-geolocation \
 %{?with_coverage:       --enable-coverage               }       \
 %{?with_pango:          --with-font-backend=pango       }       \
-%{?with_libsoup:        --with-http-backend=soup        }       \
-%{?with_svg:            --enable-svg-filters            }	\
 %{?with_wml:            --enable-wml                    }
 make %{?_smp_mflags}
 
@@ -190,6 +179,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.2.3-1
+- new upstream release
+- add Requires: libsoup-devel (devel package)
+- fix configure (remove unrecognized option)
+- drop Patch100
+
 * Wed Apr 14 2010 MATSUBAYASHI Kohji <shaoliN@vinelinux.org> - 1.2.0-2
 - rebuilt again on ppc
 

g/geoclue/geoclue-vl.spec

@@ -2,13 +2,15 @@ Summary:        A modular geoinformation service
 Summary(ja):    モジュール型地理情報サービス
 
 Name:           geoclue
-Version:        0.11.1
+Version:        0.12.0
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+Patch0:		geoclue-nm08.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: dbus-devel
@@ -17,9 +19,13 @@ BuildRequires: glib2-devel
 BuildRequires: libxml2-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
-BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
+BuildRequires: libsoup-devel
+
+#Needed for NetworkManager patch
+BuildRequires: libtool
 
 Requires: dbus
 
@@ -32,8 +38,10 @@ location-aware applications as simple as possible.
 Summary: Development package for geoclue
 Summary(ja): geoclue の開発パッケージ
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: dbus-glib-devel
+Requires: libxml2-devel
 %description devel
 Files for development with geoclue.
 
@@ -41,7 +49,7 @@ Files for development with geoclue.
 Summary: Testing gui for geoclue
 Summary(ja): geoclue のテスト用 GUI
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 
 %description gui
 Testing gui for geoclue
@@ -50,7 +58,7 @@ Testing gui for geoclue
 Summary: gpsd provider for geoclue
 Summary(ja): geoclue 用 gpsd プロバイダ
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gpsd
 
 %description gpsd
@@ -60,7 +68,7 @@ A gpsd provider for geoclue
 Summary: gypsy provider for geoclue
 Summary(ja): geoclue 用 gypsy プロバイダ
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gypsy
 
 %description gypsy
@@ -68,15 +76,24 @@ A gypsy provider for geoclue
 
 %prep
 %setup -q
+%patch0 -p1 -b .nm08
+
+# Need this for the NM-0.8 patch
+gtkdocize
+autoreconf
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgeoclue.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+# Install the test gui as it seems the test isn't installed any more
+mkdir $RPM_BUILD_ROOT%{_bindir}
+cp test/.libs/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Nominatim.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
 %{_datadir}/geoclue-providers/geoclue-example.provider
 %{_datadir}/geoclue-providers/geoclue-geonames.provider
 %{_datadir}/geoclue-providers/geoclue-hostip.provider
@@ -106,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-manual.provider
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/geoclue-providers/geoclue-nominatim.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-geonames
 %{_libexecdir}/geoclue-hostip
@@ -114,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/geoclue-master
 %{_libexecdir}/geoclue-plazes
 %{_libexecdir}/geoclue-yahoo
+%{_libexecdir}/geoclue-gsmloc
+%{_libexecdir}/geoclue-nominatim
+%{_libexecdir}/geoclue-skyhook
 
 %files devel
 %defattr(-,root,root,-)
@@ -138,6 +164,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
+* Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.0-1
+- new upstream release
+- add BuildRequires: libsoup-devel, libtool
+- change BuildRequires: NetworkManager-glib-devel instead of NetworkManager-devel
+- add Requires: dbus-glib-devel, libxml2-devel
+- add Patch0(geoclue-nm08.patch) from FC package
+- fix %build and %install
+
 * Mon Feb 02 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.11.1-1
 - initial build for Vine Linux
 

g/gpsd/gpsd-vl.spec

@@ -1,29 +1,32 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Summary: Service daemon for mediating access to a GPS
 Summary(ja): GPS にアクセスするためのサービスデーモン
 
 Name: gpsd
-Version: 2.37
+Version: 2.95
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 
 Group: System Environment/Daemons
 License: BSD
 URL: http://developer.berlios.de/projects/gpsd/
 Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
-Source1: xgps.desktop
+Source10: gpsd.init
-Source2: xgpsspeed.desktop
+Source11: gpsd.sysconfig
-Source3: gpsd-logo.png
+Patch0:	gpsd-2.95-silentmake.patch
-Patch0: python-pyexecdir-install-gpsd-2.37.patch
+Patch1: gpsd-2.95-hotplugvars.patch
-Patch1: zero.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
-BuildRequires: openMotif-devel libXaw-devel desktop-file-utils
+BuildRequires: libusb1-devel desktop-file-utils
-BuildRequires: python
+BuildRequires: libudev-devel
-BuildRequires: libXp-devel
 
+Requires: udev
 Requires(post): /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(preun): initscripts
+Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description 
@@ -67,12 +70,12 @@ can run on a serial terminal or terminal emulator.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .silentmake
-%patch1 -p0
+%patch1 -p1 -b .hotplugvars
 
 
 %build
-%configure --enable-dbus --disable-static
+%configure --enable-dbus --disable-static --disable-libQgpsmm
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -82,47 +85,57 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# X11 defaults
+# init scripts
-%{__install} -d -m 0755 %{buildroot}%{_datadir}/X11/app-defaults/
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/init.d
-%{__install} -p -m 0644 xgps.ad %{buildroot}%{_datadir}/X11/app-defaults/xgps
+%{__install} -p -m 0755 %{SOURCE10} \
-%{__install} -p -m 0644 xgpsspeed.ad \
+	%{buildroot}%{_sysconfdir}/init.d/gpsd
-	%{buildroot}%{_datadir}/X11/app-defaults/xgpsspeed
+
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+%{__install} -p -m 0644 %{SOURCE11} \
+	%{buildroot}%{_sysconfdir}/sysconfig/gpsd
+
+# udev rules
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/udev/rules.d
+%{__install} -p -m 0644 gpsd.rules \
+	%{buildroot}%{_sysconfdir}/udev/rules.d/99-gpsd.rules
 
 # hotplug script
-%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/hotplug.d/usb
+%{__install} -d -m 0755 %{buildroot}/lib/udev
-%{__install} -p -m 0644 gpsd.hotplug gpsd.usermap \
+%{__install} -p -m 0755 gpsd.hotplug gpsd.hotplug.wrapper %{buildroot}/lib/udev
-	%{buildroot}%{_sysconfdir}/hotplug.d/usb/
 
 # remove .la files
-rm -f %{buildroot}%{_libdir}/libgps.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
-
-# fix non-executable libraries
-%{__chmod} +x %{buildroot}%{_libdir}/libgps.so.17.0.0
-%{__chmod} +x %{buildroot}%{python_sitearch}/gpspacket.so
 
 # fix non-executable python script
-%{__chmod} +x %{buildroot}%{python_sitearch}/gps.py
+%{__chmod} +x %{buildroot}%{python_sitearch}/gps/gps.py
 
 # Install the .desktop files
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--add-category X-Fedora \
-	%{SOURCE1}
+	packaging/X11/xgps.desktop
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--add-category X-Fedora \
-	%{SOURCE2}
+	packaging/X11/xgpsspeed.desktop
 
 # Install logo icon for .desktop files
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/gpsd
-%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+%{__install} -p -m 0644 packaging/X11/gpsd-logo.png %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
 
 
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add %{name}
 
-%post -p /sbin/ldconfig
+%preun
+if [ $1 = 0 ]; then
+	/sbin/service %{name} stop > /dev/null 2>&1 || true
+	/sbin/chkconfig --del %{name}
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -130,35 +143,36 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README INSTALL COPYING
+%config(noreplace) %{_sysconfdir}/init.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %{_sbindir}/gpsd
 %{_bindir}/gpsprof
-%{_bindir}/sirfmon
+%{_bindir}/gpsmon
 %{_bindir}/gpsctl
-%{_libdir}/libgps.so.*
+%{_libdir}/libgps*.so.*
-%{python_sitearch}/gps.py*
+/lib/udev/gpsd*
-%{python_sitearch}/gpspacket.so
+%{python_sitearch}/gps*
+%exclude %{python_sitearch}/gps/fake*
+%ifarch x86_64
+%{python_sitelib}/gps*
+%endif
 %{_mandir}/man8/gpsd.8*
 %{_mandir}/man1/gpsprof.1*
-%{_mandir}/man1/sirfmon.1*
+%{_mandir}/man1/gpsmon.1*
 %{_mandir}/man1/gpsctl.1*
-%{_sysconfdir}/hotplug.d/usb/gpsd.hotplug
-%{_sysconfdir}/hotplug.d/usb/gpsd.usermap
 
 %files devel
 %defattr(-,root,root,-)
 %doc TODO
 %{_bindir}/gpsfake
-%{_bindir}/rtcmdecode
+%{_libdir}/libgps*.so
-%{_bindir}/gpsflash
-%{_libdir}/libgps.so
 %{_libdir}/pkgconfig/*.pc
-%{python_sitearch}/gpsfake*
+%{python_sitearch}/gps/fake*
 %{_includedir}/gps.h
 %{_includedir}/libgpsmm.h
 %{_includedir}/gpsd.h
 %{_mandir}/man1/gpsfake.1*
-%{_mandir}/man1/rtcmdecode.1*
-%{_mandir}/man1/gpsflash.1*
 %{_mandir}/man3/libgps.3*
 %{_mandir}/man3/libgpsmm.3*
 %{_mandir}/man3/libgpsd.3*
@@ -167,28 +181,32 @@ rm -rf %{buildroot}
 
 %files clients
 %defattr(-,root,root,-)
-%{_bindir}/xgps
-%{_bindir}/xgpsspeed
 %{_bindir}/cgps
+%{_bindir}/gpscat
+%{_bindir}/gpsdecode
 %{_bindir}/gpspipe
 %{_bindir}/gpxlogger
-%{_bindir}/cgpxlogger
+%{_bindir}/lcdgps
-%{_bindir}/gpscat
+%{_bindir}/xgps
+%{_bindir}/xgpsspeed
 %{_mandir}/man1/gps.1*
+%{_mandir}/man1/gpsdecode.1*
 %{_mandir}/man1/gpspipe.1*
+%{_mandir}/man1/lcdgps.1*
 %{_mandir}/man1/xgps.1*
 %{_mandir}/man1/xgpsspeed.1*
 %{_mandir}/man1/cgps.1*
 %{_mandir}/man1/gpscat.1*
-%{_mandir}/man1/cgpxlogger.1*
-%{_datadir}/X11/app-defaults/xgps
-%{_datadir}/X11/app-defaults/xgpsspeed
 %{_datadir}/applications/*.desktop
 %dir %{_datadir}/gpsd
 %{_datadir}/gpsd/gpsd-logo.png
 
 
 %changelog
+* Sun Aug 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.95-1
+- new upstream release
+- merge spec, patch, source from fedora
+
 * Mon Feb 08 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.37-3
 - add BuildRequires: libXp-devel