compiz,task-compiz,xorg-x11-drv-wacom: fix package, others: new upstream release

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

c/compiz/compiz-vl.spec

@@ -19,7 +19,7 @@ URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.8.8
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -72,6 +72,12 @@ Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
 
+# Sources from fedora
+Source11:	compiz-gtk
+Source12:	compiz-gtk.desktop
+Source13:	compiz-gnome.desktop
+Source14:	compiz-gnome.session
+
 # Patches from fedora
 Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
@@ -261,6 +267,17 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/kconfig.xml
 %endif
 
 
+install -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE12}
+# set up an X session
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
+install %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/xsessions
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
+install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
+
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
@@ -356,6 +373,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gnome -f gnome-files.txt
 %defattr(-, root, root)
+%{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
 #%{_libdir}/window-manager-settings/libcompiz.so
@@ -363,6 +381,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{_datadir}/applications/compiz.desktop
 #%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 #%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
+%{_datadir}/applications/compiz-gtk.desktop
 %{_datadir}/compiz/desktop-effects.glade
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
@@ -370,6 +389,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/36x36/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/48x48/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/96x96/apps/desktop-effects.png
+%{_datadir}/xsessions/compiz-gnome.desktop
+%{_datadir}/gnome-session/sessions/compiz-gnome.session
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %if %{with kde}
@@ -396,6 +417,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-2
+- add Source files from Fedora
+    Source11 (compiz-gtk)
+    Source12 (compiz-gtk.desktop)
+    Source13 (compiz-gnome.desktop)
+    Source14 (compiz-gnome.session)
+
 * Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
 - new upstream release
 - add BuildRequires: libxslt-devel, libglade2-devel

e/empathy/empathy-vl.spec

@@ -1,5 +1,5 @@
 %define major_ver 3.1
-%define minor_ver 5
+%define minor_ver 5.1
 %define rel       1
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -210,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.5.1-1
+- new upstream release
+
 * Sun Aug 21 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.5-1
 - new upstream release
 - add BuildRequires: pulseaudio-libs-devel

t/task-compiz/task-compiz-vl.spec

@@ -1,7 +1,7 @@
 Summary: Virtual package for Compiz
 Summary(ja): Compiz バーチャルパッケージ
 Name: task-compiz
-Version: 0.8.6
+Version: 0.8.8
 Release: 1%{?_dist_release}
 License: GPL
 Group: User Interface/Desktops
@@ -14,22 +14,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArchitectures: noarch
 Requires: compiz = %{version}
 #Requires: compiz-bcop = %{version}
-Requires: compiz-bcop = 0.8.4
+Requires: compiz-bcop = %{version}
 Requires: compiz-gnome = %{version}
 Requires: compiz-plugins = %{version}
 Requires: compiz-plugins-extra = %{version}
 Requires: compiz-plugins-extra-gnome = %{version}
 Requires: compiz-plugins-gnome = %{version}
 #Requires: compizconfig-backend-gconf = %{version}
-Requires: compizconfig-backend-gconf = 0.8.4
+Requires: compizconfig-backend-gconf = %{version}
 #Requires: compizconfig-python = %{version}
 Requires: compizconfig-python = 0.8.4
 #Requires: libcompizconfig = %{version}
-Requires: libcompizconfig = 0.8.4
+Requires: libcompizconfig = %{version}
 #Requires: ccsm = %{version}
 Requires: ccsm = 0.8.4
 #Requires: simple-ccsm = %{version}
-Requires: simple-ccsm = 0.8.4
+Requires: simple-ccsm = %{version}
 
 
 %description
@@ -46,7 +46,7 @@ Requires: %{name} = %{version}
 Requires: compiz-devel = %{version}
 Requires: compiz-plugins-devel = %{version}
 #Requires: libcompizconfig-devel = %{version}
-Requires: libcompizconfig-devel = 0.8.4
+Requires: libcompizconfig-devel = %{version}
 
 %description devel
 This is a virtual package for Compiz development files.
@@ -57,6 +57,9 @@ This is a virtual package for Compiz development files.
 %files devel
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- fix package version
+
 * Sat Nov 06 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.6-1
 - fix package version
 

u/udev/udev-vl.spec

@@ -7,8 +7,8 @@
 Summary: A userspace implementation of devfs
 Summary(ja): ユーザスペース実装のデバイスファイルシステム
 Name: udev
-Version: 154
+Version: 173
-Release: 7%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -153,18 +153,20 @@ glib-based applications using libudev functionality.
 
 %prep
 %setup -q  
-%patch101 -p1
+#%patch101 -p1
-%patch102 -p1
+#%patch102 -p1
-
 
 %build
-autoreconf -f -i
+#autoreconf -f -i
 %configure \
   --without-selinux \
   --prefix=%{_prefix} --exec-prefix="" \
-  --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib} \
+  --sysconfdir=%{_sysconfdir} \
   --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
   --with-rootlibdir=/%{_lib} --enable-introspection \
+  --enable-udev_acl \
+  --enable-floppy \
+  --enable-edd \
   --enable-debug --enable-static
 
 make %{?_smp_mflags}
@@ -179,7 +181,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev1-*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev*.a
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
@@ -204,9 +206,8 @@ ln -sf udevadm $RPM_BUILD_ROOT/sbin/udevcontrol
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
 
 for i in \
-	rules/redhat/*.rules \
 %ifarch ppc ppc64
-        rules/packages/40-ppc.rules \
+        rules/arch/40-ppc.rules \
 %endif
 	; do
 	install -m 0644 "$i"  "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}"
@@ -304,24 +305,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/start_udev
 %attr(0755,root,root) /sbin/scsi_id
-%attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/ata_id
-%attr(0755,root,root) %{udev_scriptdir}/collect
+%attr(0755,root,root) %{udev_scriptdir}/cdrom_id
 %attr(0755,root,root) %{udev_scriptdir}/edd_id
 %attr(0755,root,root) %{udev_scriptdir}/usb_id
-%attr(0755,root,root) %{udev_scriptdir}/cdrom_id
 %attr(0755,root,root) %{udev_scriptdir}/path_id
-%attr(0755,root,root) %{udev_scriptdir}/hid2hci
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
 %attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 %attr(0755,root,root) %{udev_scriptdir}/firmware
-%attr(0755,root,root) %{udev_scriptdir}/fstab_import
 %attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
 %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
 %attr(0755,root,root) %{udev_scriptdir}/write_net_rules
+%attr(0755,root,root) %{udev_scriptdir}/collect
 %attr(0755,root,root) %{udev_scriptdir}/input_id
 %attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh
-%attr(0755,root,root) %{udev_scriptdir}/mobile-action-modeswitch
+%attr(0755,root,root) %{udev_scriptdir}/mtd_probe
+%attr(0755,root,root) %{udev_scriptdir}/accelerometer
+
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
@@ -355,6 +355,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %dir %{_sysconfdir}/udev/devices/
 %ghost %dir %{_sysconfdir}/dev.d/
 
+%attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/pci-db
 %attr(0755,root,root) %{udev_scriptdir}/usb-db
 %attr(0755,root,root) %{udev_scriptdir}/keymap
@@ -365,6 +366,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 %files -n libudev
+%defattr(0644,root,root,0755)
 %attr(0755,root,root) /%{_lib}/libudev.so.*
 
 %files -n libudev-devel
@@ -383,7 +385,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgudev1
 %defattr(0644, root, root, 0755)
 %doc COPYING
-%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.*
+%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.*
 %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib
 
 %files -n libgudev1-devel
@@ -399,6 +401,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{build_compat32}
 %files -n compat32-libudev
+%defattr(0644,root,root,0755)
 %attr(0755,root,root) /%{_lib}/libudev.so.*
 
 %files -n compat32-libudev-devel
@@ -409,7 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-libgudev1
 %defattr(0644, root, root, 0755)
-%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.*
+%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.*
 
 %files -n compat32-libgudev1-devel
 %defattr(0644, root, root, 0755)
@@ -420,6 +423,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 173-1
+- new upstream release
+- drop Patch101,102
+
 * Sat Jul 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 154-7
 - add Patch102 (udev-revert-remove-support-for-ide-device.patch)
    (bug fix for BTS:1171)

x/xorg-x11-drv-wacom/xorg-x11-drv-wacom-vl.spec

@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.11.1
-Release:    1%{?_dist_release}
+Release:    2%{?_dist_release}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.11.1-2
+- update Source1 (70-wacom.rules)
+
 * Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.11.1-1
 - new upstream release