Browse Source

2015-04-24 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* d-feet, ntfs-3g: updated
	* xorg-x11-drv-vmmouse: updated spec
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9526 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
0f70abbf44
3 changed files with 139 additions and 109 deletions
  1. 54 28
      d/d-feet/d-feet-vl.spec
  2. 71 77
      n/ntfs-3g/ntfs-3g-vl.spec
  3. 14 4
      x/xorg-x11-drv-vmmouse/xorg-x11-drv-vmmouse-vl.spec

+ 54 - 28
d/d-feet/d-feet-vl.spec

@@ -1,26 +1,28 @@
 Summary:	D-Bus Debugger
 Summary(ja):	D-Bus デバッガ
 Name:		d-feet
-Version:	0.1.15
-Release:	2%{?_dist_release}
-License:	GPLv2
-Group:		User Interface/Desktops
+Version:	0.3.9
+Release:	1%{?_dist_release}
+License:	GPLv2+
+Group:		Development/Debuggers
 URL:		https://live.gnome.org/DFeet/
-BuildArch:	noarch
-
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.1/%{name}-%{version}.tar.xz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires:	dbus-python-devel
-BuildRequires:	pygtk2-devel
-BuildRequires:	python-setuptools
-
-Requires:	pygtk2
-Requires:	dbus-python
 
+Source0: 	http://download.gnome.org/sources/d-feet/0.3/%{name}-%{version}.tar.xz
+Patch0: 	d-feet-desktop-keywords.patch
 
-Requires(postun,posttrans):	desktop-file-utils
+BuildArch:	noarch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gtk3-devel
+BuildRequires: intltool
+BuildRequires: itstool
+#BuildRequires: libappstream-glib
+Requires: 	libwnck3
+Requires: 	pygobject3
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -38,45 +40,69 @@ D-Feet は簡単に使える D-Bus デバッガです。D-Feet は実行中の
 
 %prep
 %setup -q
+%patch0 -p1 -b .keywords
 
 %build
-python setup.py build
+%configure --disable-tests
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Update the screenshot shown in the software center
+#
+# NOTE: It would be *awesome* if this file was pushed upstream.
+#
+# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
+#
+#appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/d-feet.appdata.xml \
+#  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/d-feet/a.png \
+#  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/d-feet/b.png 
 
-python setup.py install --skip-build --root $RPM_BUILD_ROOT
+%find_lang d-feet --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/d-feet.desktop
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ]; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database -q &> /dev/null ||:
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
 
 
-%files
+%files -f d-feet.lang
 %defattr(-,root,root,-)
-%doc COPYING README NEWS
+%doc AUTHORS COPYING README NEWS
 %{_bindir}/%{name}
-%{python_sitelib}/d_feet-%{version}-py2.7.egg-info
+#{python_sitelib}/d_feet-%{version}-py2.7.egg-info
 %{python_sitelib}/dfeet
-%{_datadir}/applications/dfeet.desktop
-%{_datadir}/dfeet
+%{_datadir}/appdata/d-feet.appdata.xml
+%{_datadir}/applications/d-feet.desktop
+%{_datadir}/d-feet
+%{_datadir}/glib-2.0/schemas/org.gnome.d-feet.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/HighContrast/*/*/*
 
 
 %changelog
+* Fri Apr 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.3.9-1
+- updated to 0.3.9
+- updated BR
+- moved to Development/Debuggers Group
+
 * Sun Nov 23 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.15-2
 - fix typo in Group
 

+ 71 - 77
n/ntfs-3g/ntfs-3g-vl.spec

@@ -4,10 +4,10 @@ Summary: 	Linux NTFS userspace driver
 Summary(ja): 	Linux NTFS ユーザ空間ドライバ
 Name:		ntfs-3g
 
-Version:	2014.2.15
+Version:	2015.3.14
 Release:	1%{?_dist_release}
 
-License:	GPL
+License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.ntfs-3g.org/
 
@@ -29,24 +29,22 @@ Requires:       fuse
 %endif
 
 %description
-The ntfs-3g driver is an open source, GPL licensed, third generation 
-Linux NTFS driver. It provides full read-write access to NTFS, excluding 
-access to encrypted files, writing compressed files, changing file 
-ownership, access right.
-
-Technically it's based on and a major improvement to the third 
-generation Linux NTFS driver, ntfsmount. The improvements include 
-functionality, quality and performance enhancements.
-
-ntfs-3g features are being merged to ntfsmount. In the meanwhile, 
-ntfs-3g is currently the only free, as in either speech or beer, NTFS 
-driver for Linux that supports unlimited file creation and deletion.
+NTFS-3G is a stable, open source, GPL licensed, POSIX, read/write NTFS 
+driver for Linux and many other operating systems. It provides safe 
+handling of the Windows XP, Windows Server 2003, Windows 2000, Windows 
+Vista, Windows Server 2008 and Windows 7 NTFS file systems. NTFS-3G can 
+create, remove, rename, move files, directories, hard links, and streams; 
+it can read and write normal and transparently compressed files, including 
+streams and sparse files; it can handle special files like symbolic links, 
+devices, and FIFOs, ACL, extended attributes; moreover it provides full 
+file access right and ownership support.
 
 %package devel
 Summary:	Development files and libraries for ntfs-3g
 Summary(ja):	ntfs-3g の開発ファイルとライブラリ
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 Provides:       ntfsprogs-devel = %{version}-%{release}
 Obsoletes:      ntfsprogs-devel < 2.0.0-3
 
@@ -77,44 +75,38 @@ installation).
            --disable-ldconfig \
 %{?with_ externalfuse:--with-fuse=external} \
 	   --exec-prefix=/ \
-	   --bindir=/bin \
-	   --sbindir=/sbin \
-	   --libdir=/%{_lib} \
 	   --enable-crypto \
-	   --enable-extras
+	   --enable-extras \
+	   --enable-quarantined
+
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin
 make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libntfs-3g.a
 
-# make the symlink an actual copy to avoid confusion
-rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
-cp -a $RPM_BUILD_ROOT/bin/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
+rm -rf $RPM_BUILD_ROOT%{_sbindir}/mount.ntfs-3g
+cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT%{_sbindir}/mount.ntfs-3g
 
 # make compatibility symlinks
-ln -s ntfs-3g $RPM_BUILD_ROOT/bin/ntfsmount
-ln -s mount.ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-fuse
-ln -s mount.ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs
-ln -s ../bin/ntfsck $RPM_BUILD_ROOT/sbin/fsck.ntfs
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-ln -s /bin/ntfs-3g $RPM_BUILD_ROOT%{_bindir}/ntfs-3g
-ln -s /bin/ntfsmount $RPM_BUILD_ROOT%{_bindir}/ntfsmount
-
-# Put the .pc file in the right place.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-
-
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
-
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libntfs-3g.la
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -s ntfs-3g ntfsmount
+popd
+pushd $RPM_BUILD_ROOT%{_sbindir}
+ln -s mount.ntfs-3g mount.ntfs-fuse
+# And since there is no other package in Fedora that provides an ntfs 
+# mount...
+ln -s mount.ntfs-3g mount.ntfs
+# Need this for fsck to find it
+ln -s ../bin/ntfsck fsck.ntfs
+popd
+
+mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir}
+rm -rf $RPM_BUILD_ROOT/sbin
+
+# We get this on our own, thanks.
+rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,20 +118,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
-/sbin/mount.lowntfs-3g
-/sbin/mount.ntfs
-%attr(4754,root,root) /sbin/mount.ntfs-3g
-/sbin/mount.ntfs-fuse
-/bin/lowntfs-3g
-/bin/ntfs-3g
-/bin/ntfs-3g.probe
-/bin/ntfs-3g.secaudit
-/bin/ntfs-3g.usermap
-/bin/ntfsmount
+%{_sbindir}/mount.ntfs
+%{_sbindir}/mount.ntfs-3g
+%{_sbindir}/mount.ntfs-fuse
+%{_sbindir}/mount.lowntfs-3g
 %{_bindir}/ntfs-3g
 %{_bindir}/ntfsmount
-/%{_lib}/libntfs-3g.so.*
-%{_datadir}/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi
+%{_bindir}/ntfs-3g.probe
+%{_bindir}/ntfs-3g.secaudit
+%{_bindir}/ntfs-3g.usermap
+%{_bindir}/lowntfs-3g
+%{_libdir}/libntfs-3g.so.*
 %{_mandir}/man8/mount.lowntfs-3g.*
 %{_mandir}/man8/mount.ntfs-3g.*
 %{_mandir}/man8/ntfs-3g*
@@ -147,39 +136,44 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/ntfs-3g/
-/%{_lib}/libntfs-3g.so
+%{_libdir}/libntfs-3g.so
 %{_libdir}/pkgconfig/*.pc
 
 %files -n ntfsprogs
 %doc AUTHORS COPYING CREDITS ChangeLog NEWS README
-/bin/ntfscat
-/bin/ntfscluster
-/bin/ntfscmp
-/bin/ntfsfix
-/bin/ntfsinfo
-/bin/ntfsls
+%{_bindir}/ntfscat
+%{_bindir}/ntfscluster
+%{_bindir}/ntfscmp
+%{_bindir}/ntfsfix
+%{_bindir}/ntfsinfo
+%{_bindir}/ntfsls
 # extras
-/bin/ntfsck
-/bin/ntfsdecrypt
-/bin/ntfsdump_logfile
-/bin/ntfsmftalloc
-/bin/ntfsmove
-/bin/ntfstruncate
-/bin/ntfswipe
-/sbin/fsck.ntfs
-/sbin/mkfs.ntfs
-/sbin/mkntfs
-/sbin/ntfsclone
-/sbin/ntfscp
-/sbin/ntfslabel
-/sbin/ntfsresize
-/sbin/ntfsundelete
+%{_bindir}/ntfsck
+%{_bindir}/ntfsdecrypt
+%{_bindir}/ntfsdump_logfile
+%{_bindir}/ntfsfallocate
+%{_bindir}/ntfsmftalloc
+%{_bindir}/ntfsmove
+%{_bindir}/ntfstruncate
+%{_bindir}/ntfswipe
+%{_sbindir}/fsck.ntfs
+%{_sbindir}/mkfs.ntfs
+%{_sbindir}/mkntfs
+%{_sbindir}/ntfsclone
+%{_sbindir}/ntfscp
+%{_sbindir}/ntfslabel
+%{_sbindir}/ntfsresize
+%{_sbindir}/ntfsundelete
 %{_mandir}/man8/mkntfs.8*
 %{_mandir}/man8/mkfs.ntfs.8*
 %{_mandir}/man8/ntfs[^m][^o]*.8*
-
+%exclude %{_mandir}/man8/ntfs-3g*
 
 %changelog
+* Fri Apr 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2015.3.14-1
+- new upstream release
+- dropt hal files, since hal is very old
+
 * Sun Mar 02 2014 NAKAMURA Kenta <kenta@vinelinux.org> 2014.2.15-1
 - new upstream release
 

+ 14 - 4
x/xorg-x11-drv-vmmouse/xorg-x11-drv-vmmouse-vl.spec

@@ -6,13 +6,16 @@ Summary:   Xorg X11 vmmouse input driver
 Summary(ja):   Xorg X11 vmmouse 入力ドライバ
 Name:      xorg-x11-drv-vmmouse
 Version:   13.0.0
-Release:   4%{?_dist_release}
+Release:   5%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+# 604660 - vmmouse_detect unexpected exit with status 0x000b
+Patch2:     vmmouse-12.6.9-iopl-revert.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
@@ -30,10 +33,11 @@ X.Org X11 vmmouse input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch2 -p1 
 
 %build
 %configure --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,14 +47,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+# Don't need HAL no more
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/hal/hal-probe-vmmouse
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/vmmouse_detect
-%{_libdir}/hal/hal-probe-vmmouse
-%{_datadir}/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 %{driverdir}/vmmouse_drv.so
 %{_mandir}/man1/vmmouse_detect.1*
 %{_mandir}/man4/vmmouse.4*
@@ -58,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/69-xorg-vmmouse.rules
 
 %changelog
+* Fri Apr 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 13.0.0-5
+- dropt hal files, since hal is very old
+- added Patch2 from Fedora
+
 * Sun Nov 23 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 13.0.0-4
 - rebuild with xserver-1.16.2