Browse Source

remove Requires: hal

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5361 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 10 years ago
parent
commit
ab2aea1300

+ 12 - 3
g/gimp/gimp-vl.spec

@@ -6,14 +6,14 @@ Summary: 	The GNU Image Manipulation Program
 Summary(ja):    GNU 画像加工プログラム
 Name: 		gimp
 Version: 	2.6.11
-Release:        5%{?_dist_release}
+Release:        6%{?_dist_release}
 License: 	GPL, LGPL
 Group: 		Applications/Graphics
 URL: 		http://www.gimp.org/
 Source: 	ftp://ftp.gimp.org/pub/gimp/%{verdir}/%{name}-%{version}.tar.bz2
 
 # including security fix for CVE-2010-4540,4541,4542,4543 and CVE-2011-1782,2896
-Patch0:		gimp-2.6-git20110825.patch
+Patch0:		gimp-2.6-git20120103.patch
 
 Patch10:	gimp-2.0-desktopfile-no-gimp-remote.patch
 
@@ -39,14 +39,15 @@ BuildRequires:	gegl-devel
 BuildRequires:  poppler-devel >= 0.14.2
 BuildRequires:  curl-devel
 BuildRequires:  libwmf-devel
-BuildRequires:  hal-devel
 BuildRequires:  dbus-devel
+BuildRequires:  dbus-glib-devel
 BuildRequires:  gvfs-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  python-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  pygtk2-devel
+BuildRequires:  libxslt
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -128,10 +129,12 @@ and gimp, and you may want to install gimp-data-extras.
 
 
 %build
+autoreconf -if
 %configure \
 	--without-print \
 	--without-libmng \
 	--without-webkit \
+	--without-hal \
 	--with-libexif \
 	--with-gvfs \
 	--enable-mp
@@ -235,6 +238,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.11-6
+- remove BuildRequires: hal-devel
+- add configure option (--without-hal)
+- update Patch0 (gimp-2.6-git20120103.patch)
+- add BuildRequires: dbus-glib-devel, libxslt
+
 * Wed Sep 07 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.11-5
 - add Patch0 (gimp-2.6-git20110825.patch)
   (including security fix for CVE-2010-4540,4541,4542,4543 and CVE-2011-1782,2896)

+ 33 - 6
g/gnome-vfs2/gnome-vfs2-vl.spec

@@ -5,7 +5,6 @@
 %define gamin_version 0.1.10
 %define vine_menus_version 3.0
 %define samba_version 3.2.5
-%define hal_version 0.5.11
 ##%define gnome_mount_version 0.8
 %define avahi_version 0.6.23
 %define dbus_version 1.4.0
@@ -19,7 +18,7 @@ Summary: The GNOME virtual file-system libraries.
 Summary(ja): GNOME 仮想ファイルシステムライブラリ
 Name: gnome-vfs2
 Version: 2.24.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
@@ -41,27 +40,41 @@ BuildRequires: popt-devel, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: libsmbclient-devel >= %{samba_version}
-BuildRequires: hal-devel >= %{hal_version}
 ##BuildRequires: gnome-mount-devel >= %{gnome_mount_version}
 BuildRequires: avahi-glib-devel >= %{avahi_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: openssl-devel
 BuildRequires: automake, autoconf
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
+# CVE-2009-2473 neon, gnome-vfs2 embedded neon: billion laughs DoS attack
+# https://bugzilla.redhat.com/show_bug.cgi?id=518215
+Patch5: gnome-vfs-2.24.3-CVE-2009-2473.patch
+
+# RH bug #197868
+Patch6: gnome-vfs-2.15.91-mailto-command.patch
+
 # send to upstream
 Patch101: gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
 Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
 
-# RH bug #197868
-Patch6: gnome-vfs-2.15.91-mailto-command.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=333041
 # https://bugzilla.redhat.com/show_bug.cgi?id=335241
 Patch300: gnome-vfs-2.20.0-ignore-certain-mountpoints.patch
 
+# backported from upstream
+
+# gnome-vfs-daemon exits on dbus, and constantly restarted causing dbus/hal to hog CPU
+# https://bugzilla.redhat.com/show_bug.cgi?id=486286
+Patch404: gnome-vfs-2.24.xx-utf8-mounts.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=435653
+Patch405: 0001-Add-default-media-application-schema.patch
+
 # vine default
 Patch1000: gnome-vfs2-2.22.0-vine.patch
 
@@ -134,6 +147,7 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
 %setup -q -n gnome-vfs-%{version}
   
 %patch3 -p1 -b .modules-conf
+%patch5 -p1 -b .CVE-2009-2473
 %patch6 -p1 -b .mailto-command
 
 # send to upstream
@@ -143,6 +157,10 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
 
 %patch300 -p1 -b .ignore-certain-mount-points
 
+%patch404 -p1 -b .utf8-mounts
+
+%patch405 -p1 -b .default-media
+
 # Vine
 %patch1000 -p1 -b .browser_default
 
@@ -156,7 +174,7 @@ if pkg-config openssl ; then
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 
-%configure --disable-gtk-doc --enable-hal
+%configure --disable-gtk-doc --disable-hal
 
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
@@ -267,6 +285,15 @@ fi
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.4-2
+- add BuildRequires: openssl-devel
+- remove BuildRequires: hal-devel
+- add configure option (--disable-hal)
+- add patches from fedora
+  - Patch5 (gnome-vfs-2.24.3-CVE-2009-2473.patch)
+  - Patch404 (gnome-vfs-2.24.xx-utf8-mounts.patch)
+  - Patch405 (0001-Add-default-media-application-schema.patch)
+
 * Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.4-1
 - new upstream release
 - remove BuildRequires: gnome-mount-devel

+ 8 - 6
g/gstreamer-plugins-good/gstreamer-plugins-good-vl.spec

@@ -13,7 +13,6 @@
 %define _libpng_ver	1.2.0
 %define _speex_ver	1.1.5
 %define _taglib_ver	1.5
-%define _hal_ver	0.5.6
 %define _dbus_ver	1.0
 %define _soup_ver	2.26.0
 %define _libshout_ver   2.2.2
@@ -25,7 +24,7 @@ Name:		gstreamer-plugins-good
 Summary:	GStreamer Streaming-media framework good plugins
 Summary(ja):	GStreamer ストリーミングメディアフレームワーク用優良プラグイン
 Version:	0.10.30
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -51,7 +50,6 @@ BuildRequires:	libavc1394-devel libraw1394-devel libiec61883-devel
 BuildRequires:	speex-devel >= %{_speex_ver}
 BuildRequires:	zlib-devel
 BuildRequires:	taglib-devel >= %{_taglib_ver}
-BuildRequires:	hal-devel >= %{_hal_ver}
 BuildRequires:	dbus-devel >= %{_dbus_ver}
 BuildRequires:	libsoup-devel >= %{_soup_ver}
 BuildRequires:	libshout-devel >= %{_libshout_ver}
@@ -71,7 +69,6 @@ Requires:	cairo >= %{_cairo_ver}
 Requires:	libjpeg
 Requires:	libpng >= %{_libpng_ver}
 Requires:	taglib >= %{_taglib_ver}
-Requires:	hal >= %{_hal_ver}
 Requires:	dbus >= %{_dbus_ver}
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -206,7 +203,8 @@ files.
 
 %configure \
 	-with-package-name='Vine Linux gstreamer-plugins-good package' \
-	--disable-ladspa --disable-libcaca --disable-esd \
+	--disable-ladspa --disable-libcaca \
+	--disable-esd --disable-hal \
 	--disable-shout2 --disable-shout2test \
 	--enable-gtk-doc --disable-debug \
         --disable-schemas-install
@@ -304,7 +302,6 @@ export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
 %{_libdir}/gstreamer-%{major}/libgstcairo.so
 %{_libdir}/gstreamer-%{major}/libgstgconfelements.so
 %{_libdir}/gstreamer-%{major}/libgstgdkpixbuf.so
-%{_libdir}/gstreamer-%{major}/libgsthalelements.so
 %{_libdir}/gstreamer-%{major}/libgstjpeg.so
 %{_libdir}/gstreamer-%{major}/libgstpng.so
 %{_libdir}/gstreamer-%{major}/libgstsouphttpsrc.so
@@ -336,6 +333,11 @@ export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
 %{_datadir}/gtk-doc/html/gst-plugins-good-plugins-%{major}
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.30-2
+- remove BuildRequires: hal-devel
+- remove Requires: hal
+- add configure option (--disable-hal)
+
 * Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.30-1
 - new upstream release
 - delete BuildRequires: esound-devel

+ 5 - 2
k/kudzu/kudzu-vl.spec

@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.86
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Summary: The Vine Linux hardware probing tool.
 Summary(ja): Vine Linux ハードウエア検出ツール
@@ -22,7 +22,7 @@ Conflicts: netconfig < 0.8.18
 Conflicts: Xconfigurator <= 4.9
 Conflicts: mouseconfig < 4.18
 Conflicts: initscripts < 8.40
-Requires: hwdata >= 0.146.1, hal >= 0.5.7
+Requires: hwdata >= 0.146.1
 
 %description
 Kudzu is a hardware probing tool run at system boot time to determine
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kudzu
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.86-2
+- remove Requires: hal
+
 * Tue May 24 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.86-1
 - update to 1.2.86
 - add patch20 to work with new sysfs

+ 12 - 4
lib/libs/libsynce/libsynce-vl.spec

@@ -1,6 +1,6 @@
 Name:           libsynce
-Version:        0.15
-Release:        2%{?_dist_release}
+Version:        0.15.1
+Release:        1%{?_dist_release}
 Summary:        Connection library for Pocket PC devices
 
 Group:          System Environment/Libraries
@@ -10,12 +10,15 @@ Source0:        http://download.sf.net/synce/libsynce-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
-BuildRequires:  hal-devel
 
 # Provide an upgrade path from the monilithic synce package
 Provides:       synce = %{version}-%{release}
 Obsoletes:      synce <= 0.9.1-10
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
+
 %description
 The purpose of the SynCE project is to provide a means of
 communication with a Windows CE device from a computer running Linux,
@@ -39,7 +42,7 @@ homepage at http://www.synce.org
 %setup -q 
 
 %build
-%configure --disable-static --disable-rpath
+%configure --disable-static --disable-rpath --disable-hal-support
 make %{?_smp_mflags}
 
 
@@ -73,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.15.1-1
+- update to 0.15.1
+- remove BuildRequires: hal-devel
+- add configure option (--disable-hal-support)
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.15-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

+ 12 - 4
p/pcmanfm/pcmanfm-vl.spec

@@ -1,9 +1,9 @@
 %define		enable_inotify	0
-%define		enable_hal	1
+%define		enable_hal	0
 
 Name:           pcmanfm
 Version:        0.5.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:	Extremly fast and lightweight file manager
 Summary(ja):	とても高速で軽量なファイルマネージャ
 
@@ -14,6 +14,7 @@ Source0:        http://osdn.dl.sourceforge.net/sourceforge/pcmanfm/%{name}-%{ver
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
 Patch1:		pcmanfm-0.5-fix-str-fmt.patch
 Patch2:		ca_po.patch
+Patch3:		pcmanfm-0.5.2-makefile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -25,11 +26,10 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  startup-notification-devel
 BuildRequires:  dbus-devel
-BuildRequires:  hal-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:	cairo-devel
 
-Requires:       gtk2 >= 2.14, gamin, dbus-glib, hal
+Requires:       gtk2 >= 2.14, gamin, dbus-glib
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -47,9 +47,11 @@ PCMan File Manager はタブブラウズとユーザーフレンドリーな
 %patch0 -p1 -b .search_hang
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 chmod 644 INSTALL COPYING
 
 %build
+autoreconf -if
 %configure \
 %if %{enable_hal} >= 1
 	--enable-hal \
@@ -97,6 +99,12 @@ update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.5.2-2
+- remove BuildRequires: hal-devel
+- remove Requires: hal
+- change configure option (--disable-hal)
+- add Patch3 (pcmanfm-0.5.2-makefile.patch)
+
 * Sun Nov 1 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.2-1
 - new upstream release
 - added Patch2 to fix build error

+ 18 - 11
p/pcsc-lite/pcsc-lite-vl.spec

@@ -2,22 +2,21 @@ Summary:        PC/SC Lite smart card framework and applications
 Summary(ja):    PC/SC Lite スマートカードフレームワークおよびアプリケーション
 
 Name:           pcsc-lite
-Version:        1.5.5
-Release:        2%{?_dist_release}
+Version:        1.8.1
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
 Source0:        http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-1.4-docinst.patch
-Patch1:         %{name}-1.5.5-rpath64.patch
-Patch2:         %{name}-close_on_exec.patch
+Patch1:         pcsc-lite-1.8.1-etc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  libusb-devel >= 0.1.7
-BuildRequires:  hal-devel 
+BuildRequires:  libudev-devel
 BuildRequires:  doxygen
+BuildRequires:  flex
 Requires(post): initscripts
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -68,10 +67,10 @@ Group:          Documentation
 %prep
 %setup -q
 %patch0 -p0 -b .docinst
-%patch1 -p1 -b .rpath64
-%patch2 -p1 -b .close_on_exec
+%patch1 -p1 -b .etc
 
 %build
+autoreconf -if
 %configure \
   --disable-dependency-tracking \
   --disable-static \
@@ -91,18 +90,19 @@ install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
 
 install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
 cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README
 All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
 by %{_sbindir}/update-reader.conf.
 EOF
 
-rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la}
+rm -f $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la}
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/README.DAEMON
 touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
 
 # formaticc doesn't exist any more, don't include the man page
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1*
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,16 +138,17 @@ fi
 %{_libdir}/pcsc/
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
-%{_mandir}/man8/update-reader.conf.8*
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libpcsclite.so.*
+%{_libdir}/libpcscspy.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/PCSC/
 %{_libdir}/libpcsclite.so
+%{_libdir}/libpcscspy.so
 %{_libdir}/pkgconfig/libpcsclite.pc
 
 %files doc
@@ -156,6 +157,12 @@ fi
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.1-1
+- new upstream release
+- remove BuildRequires: hal-devel, libusb-devel
+- add BuildRequires: libudev-devel, flex
+- add Patch1 (pcsc-lite-1.8.1-etc.patch)
+
 * Fri Oct 01 2010 Shu KONNO <owa@bg.wakwak.com> 1.5.5-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 6 - 3
p/pcsc-perl/pcsc-perl-vl.spec

@@ -1,4 +1,4 @@
-%define pcscver 1.3.0
+%define pcscver 1.8.1
 %define pcsclib libpcsclite.so.1
 %ifarch x86_64 ppc64 ia64 sparc64 s390x
 %define mark64  ()(64bit)
@@ -8,13 +8,13 @@ Summary:        Perl interface to the PC/SC smart card library
 Summary(ja):    PC/SC スマートカードライブラリ用の Perl インタフェース
 
 Name:           pcsc-perl
-Version:        1.4.10
+Version:        1.4.12
 Release:        1%{?_dist_release}
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
-Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{name}-%{version}.tar.gz
+Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.12-1
+- new upstream release
+
 * Sun Mar 27 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.10-1
 - new upstream release
 - rebuild with perl-5.12

+ 4 - 2
p/pcsc-tools/pcsc-tools-vl.spec

@@ -2,14 +2,13 @@ Summary:        Tools to be used with smart cards and PC/SC
 Summary(ja):    スマートカードおよびPC/SCを使うためのツール
 
 Name:           pcsc-tools
-Version:        1.4.17
+Version:        1.4.18
 Release:        1%{?_dist_release}
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz.asc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  desktop-file-utils
@@ -64,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.18-1
+- new upstream release
+
 * Sun Mar 27 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.17-1
 - new upstream release
 - build with perl-5.12.3

+ 8 - 3
p/pmount/pmount-vl.spec

@@ -1,6 +1,6 @@
 %define name pmount
 %define version 0.9.22
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 
 Summary: Pmount allow mounting devices without fstab modifications
 Summary(ja): fstab を書き換えずにデバイスをマウントするためのツール
@@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #Buildrequires: automake
 #Buildrequires: automake19
 Buildrequires: sysfsutils-devel
-Buildrequires: hal-devel
+Buildrequires: libblkid-devel
 Buildrequires: dbus-devel
 Buildrequires: perl-XML-Parser
 Buildrequires: intltool
@@ -43,6 +43,7 @@ Pmount は usb や firewire, pcmcia のようなメディアを /etc/fstab を
 #automake-1.9
 
 %configure \
+  --disable-hal \
   --with-lock-dir=%{_localstatedir}/lock/pmount \
   --with-whitelist=%{_sysconfdir}/pmount.allow
 
@@ -63,11 +64,15 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/pmount.allow
 %attr(4755,root,root) %{_bindir}/pmount
 %attr(4755,root,root) %{_bindir}/pumount
-%{_bindir}/pmount-hal
 %{_mandir}/man1/p*mount*.1*
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.22-2
+- remove BuildRequires: hal-devel
+- add BuildRequires: libblkid-devel
+- add configure option (--disable-hal)
+
 * Tue May 25 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.9.22-1
 - new upstream release
 - added Buildrequires: intltool

+ 10 - 2
t/telepathy-stream-engine/telepathy-stream-engine-vl.spec

@@ -3,13 +3,15 @@ Summary(ja):    メディアストリーミングを扱うための Telepathy 
 
 Name:           telepathy-stream-engine
 Version:        0.5.15
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          Applications/Communications
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
 Source0:        http://telepathy.freedesktop.org/releases/stream-engine/%{name}-%{version}.tar.gz
 
+Patch0:		telepathy-stream-engine-no-hal.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	glib2-devel >= 2.26.0
 BuildRequires:	gtk2-devel >= 2.22.0
@@ -21,8 +23,8 @@ BuildRequires:	gstreamer-devel >= 0.10.30
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.30
 BuildRequires:	telepathy-farsight-devel >= 0.0.15
 BuildRequires:	libX11-devel
-BuildRequires:	hal-devel
 BuildRequires:	libxslt
+BuildRequires:	autoconf
 
 
 %description
@@ -32,8 +34,10 @@ streaming for channels with the IceSignalling interface.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-hal
 
 %build
+autoreconf -if
 %configure --disable-seq-dias
 make %{?_smp_mflags}
 
@@ -55,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.15-2
+- remove BuildRequires: hal-devel
+- add Patch0 (telepathy-stream-engine-no-hal.patch)
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.15-1
 - new upstream release
 - add BuildRequires: hal-devel, gtk2-devel

+ 5 - 3
t/thunar-vfs/thunar-vfs-vl.spec

@@ -5,7 +5,7 @@
 Name:           thunar-vfs
 Summary:        Virtual filesystem shipped with Thunar 1.0 and earlier releases
 Version:        1.2.0
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -23,7 +23,6 @@ BuildRequires:  gettext
 BuildRequires:  glib2-devel >= 2.12.0
 BuildRequires:  gtk-doc
 BuildRequires:  gtk2-devel >= 2.10.0
-BuildRequires:  hal-devel >= 0.5.7
 BuildRequires:  intltool
 BuildRequires:  libexo-devel >= 0.6.0
 BuildRequires:  libjpeg-devel
@@ -54,7 +53,7 @@ developing applications that use %{name}.
 %setup -q
 
 %build
-%configure --disable-static --enable-gtk-doc 
+%configure --disable-static --enable-gtk-doc --with-volume-manager=none
 make %{?_smp_mflags}
 
 
@@ -99,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/thunar-vfs-*.pc
 
 %changelog
+* Sat Jan 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.2.0-4
+- remove BuildRequires: hal-devel
+
 * Tue Mar 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-3
 - Initial build for Vine Linux