Browse Source

GNOME-3.6.0 & Cinnamon-1.6.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6890 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 11 years ago
parent
commit
7032d11794
100 changed files with 1660 additions and 1131 deletions
  1. 11 1
      C/ConsoleKit/ConsoleKit-vl.spec
  2. 4 2
      G/GConf2/GConf2-vl.spec
  3. 23 7
      P/PackageKit/PackageKit-vl.spec
  4. 12 5
      W/WebKit/WebKit-vl.spec
  5. 20 7
      W/WebKit3/WebKit3-vl.spec
  6. 10 7
      a/accerciser/accerciser-vl.spec
  7. 4 1
      a/accountsservice/accountsservice-vl.spec
  8. 11 5
      a/acpid/acpid-vl.spec
  9. 6 3
      a/alacarte/alacarte-vl.spec
  10. 6 6
      a/anjuta-extras/anjuta-extras-vl.spec
  11. 11 7
      a/anjuta/anjuta-vl.spec
  12. 33 11
      a/at-spi2-atk/at-spi2-atk-vl.spec
  13. 5 2
      a/at-spi2-core/at-spi2-core-vl.spec
  14. 5 3
      a/atk/atk-vl.spec
  15. 5 4
      b/banshee/banshee-vl.spec
  16. 40 41
      b/baobab/baobab-vl.spec
  17. 5 2
      b/blueman/blueman-vl.spec
  18. 12 7
      b/brasero/brasero-vl.spec
  19. 8 10
      c/caribou/caribou-vl.spec
  20. 17 10
      c/cheese/cheese-vl.spec
  21. 21 30
      c/cinnamon/cinnamon-vl.spec
  22. 4 1
      c/clutter-gesture/clutter-gesture-vl.spec
  23. 13 9
      c/clutter-gst/clutter-gst-vl.spec
  24. 5 2
      c/clutter-gtk/clutter-gtk-vl.spec
  25. 4 1
      c/clutter-imcontext/clutter-imcontext-vl.spec
  26. 6 3
      c/clutter/clutter-vl.spec
  27. 20 7
      c/cogl/cogl-vl.spec
  28. 71 0
      c/colord-gtk/colord-gtk-vl.spec
  29. 12 4
      c/colord/colord-vl.spec
  30. 21 32
      c/control-center/control-center-vl.spec
  31. 7 5
      d/dbus-glib/dbus-glib-vl.spec
  32. 6 16
      d/dbus/dbus-vl.spec
  33. 19 8
      d/dconf/dconf-vl.spec
  34. 23 7
      d/devhelp/devhelp-vl.spec
  35. 30 1
      d/docbook-style-xsl/docbook-style-xsl-vl.spec
  36. 5 2
      e/ekiga/ekiga-vl.spec
  37. 18 20
      e/empathy/empathy-vl.spec
  38. 14 12
      e/eog-plugins/eog-plugins-vl.spec
  39. 13 16
      e/eog/eog-vl.spec
  40. 12 9
      e/epiphany/epiphany-vl.spec
  41. 13 45
      e/evince/evince-vl.spec
  42. 25 21
      e/evolution-data-server/evolution-data-server-vl.spec
  43. 23 134
      e/evolution/evolution-vl.spec
  44. 8 3
      e/exempi/exempi-vl.spec
  45. 8 6
      e/expat/expat-vl.spec
  46. 21 16
      f/farstream/farstream-vl.spec
  47. 22 28
      f/file-roller/file-roller-vl.spec
  48. 22 7
      f/folks/folks-vl.spec
  49. 16 11
      f/fprintd/fprintd-vl.spec
  50. 7 1
      f/fuse/fuse-vl.spec
  51. 10 17
      g/gcalctool/gcalctool-vl.spec
  52. 5 3
      g/gcr/gcr-vl.spec
  53. 4 3
      g/gdk-pixbuf2/gdk-pixbuf2-vl.spec
  54. 6 6
      g/gdl/gdl-vl.spec
  55. 35 43
      g/gdm/gdm-vl.spec
  56. 8 17
      g/gedit-plugins/gedit-plugins-vl.spec
  57. 10 11
      g/gedit/gedit-vl.spec
  58. 17 10
      g/geoclue/geoclue-vl.spec
  59. 8 5
      g/gjs/gjs-vl.spec
  60. 4 1
      g/glabels/glabels-vl.spec
  61. 10 36
      g/glade3/glade3-vl.spec
  62. 11 8
      g/glib-networking/glib-networking-vl.spec
  63. 9 7
      g/glib2/glib2-vl.spec
  64. 5 2
      g/glibmm/glibmm-vl.spec
  65. 12 17
      g/gnome-applets/gnome-applets-vl.spec
  66. 5 2
      g/gnome-backgrounds/gnome-backgrounds-vl.spec
  67. 13 20
      g/gnome-bluetooth/gnome-bluetooth-vl.spec
  68. 11 12
      g/gnome-color-manager/gnome-color-manager-vl.spec
  69. 5 2
      g/gnome-common/gnome-common-vl.spec
  70. 21 19
      g/gnome-desktop3/gnome-desktop3-vl.spec
  71. 5 2
      g/gnome-devel-docs/gnome-devel-docs-vl.spec
  72. 110 0
      g/gnome-dictionary/gnome-dictionary-vl.spec
  73. 30 8
      g/gnome-disk-utility/gnome-disk-utility-vl.spec
  74. 12 2
      g/gnome-documents/gnome-documents-vl.spec
  75. 61 0
      g/gnome-font-viewer/gnome-font-viewer-vl.spec
  76. 20 41
      g/gnome-games/gnome-games-vl.spec
  77. 5 2
      g/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-vl.spec
  78. 5 2
      g/gnome-icon-theme/gnome-icon-theme-vl.spec
  79. 7 6
      g/gnome-keyring/gnome-keyring-vl.spec
  80. 12 5
      g/gnome-menus/gnome-menus-vl.spec
  81. 9 3
      g/gnome-online-accounts/gnome-online-accounts-vl.spec
  82. 8 5
      g/gnome-packagekit/gnome-packagekit-vl.spec
  83. 18 67
      g/gnome-panel/gnome-panel-vl.spec
  84. 13 39
      g/gnome-power-manager/gnome-power-manager-vl.spec
  85. 8 5
      g/gnome-screensaver/gnome-screensaver-vl.spec
  86. 10 3
      g/gnome-screenshot/gnome-screenshot-vl.spec
  87. 100 0
      g/gnome-search-tool/gnome-search-tool-vl.spec
  88. 18 18
      g/gnome-session/gnome-session-vl.spec
  89. 15 4
      g/gnome-settings-daemon/gnome-settings-daemon-vl.spec
  90. 15 7
      g/gnome-shell-extensions/gnome-shell-extensions-vl.spec
  91. 14 6
      g/gnome-shell/gnome-shell-vl.spec
  92. 75 0
      g/gnome-system-log/gnome-system-log-vl.spec
  93. 10 6
      g/gnome-system-monitor/gnome-system-monitor-vl.spec
  94. 12 9
      g/gnome-terminal/gnome-terminal-vl.spec
  95. 7 8
      g/gnome-themes-standard/gnome-themes-standard-vl.spec
  96. 68 0
      g/gnome-themes-vine/gnome-themes-vine-vl.spec
  97. 7 16
      g/gnome-themes/gnome-themes-vl.spec
  98. 20 2
      g/gnome-tweak-tool/gnome-tweak-tool-vl.spec
  99. 5 3
      g/gnome-user-docs/gnome-user-docs-vl.spec
  100. 15 23
      g/gnome-user-share/gnome-user-share-vl.spec

+ 11 - 1
C/ConsoleKit/ConsoleKit-vl.spec

@@ -7,12 +7,16 @@ Summary: System daemon for tracking users, sessions and seats
 Summary(ja): ユーザ、セッションおよび座席を捕捉するシステムデーモン
 Summary(ja): ユーザ、セッションおよび座席を捕捉するシステムデーモン
 Name: ConsoleKit
 Name: ConsoleKit
 Version: 0.4.5
 Version: 0.4.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 License: GPLv2+
 Group: System Environment/Daemons
 Group: System Environment/Daemons
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 
 
 Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.bz2
 Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.bz2
+# Convert to new upstart syntax
+Patch0: ConsoleKit-0.4.1-upstart06.patch
+
+Patch1:	ConsoleKit-0.4.5-git20120320.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -89,6 +93,8 @@ Developer documentation for ConsoleKit.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
+%patch0 -p1 -b .upstart06
+%patch1 -p1
 
 
 %build
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -180,6 +186,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.5-2
+- add Patch0 (ConsoleKit-0.4.1-upstart06.patch)
+- add Patch1 (ConsoleKit-0.4.5-git20120320.patch)
+
 * Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.5-1
 * Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.5-1
 - new upstream release
 - new upstream release
 
 

+ 4 - 2
G/GConf2/GConf2-vl.spec

@@ -10,7 +10,7 @@ Summary: A process-transparent configuration system
 Summary(ja): プロセス透過型設定システム
 Summary(ja): プロセス透過型設定システム
 Name: GConf2
 Name: GConf2
 Version: 3.2.5
 Version: 3.2.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPL
 License: LGPL
 Group: System Environment/Base
 Group: System Environment/Base
 Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
 Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
@@ -206,11 +206,13 @@ fi
 %files -n compat32-%{name}-devel
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
 %defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
 
 
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.5-1
+- remove *.pc from compat32-%{name}-devel
+
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.5-1
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.5-1
 - new upstream release
 - new upstream release
 
 

+ 23 - 7
P/PackageKit/PackageKit-vl.spec

@@ -1,7 +1,7 @@
 # Basic Information
 # Basic Information
 Name:		PackageKit
 Name:		PackageKit
-Version:	0.7.1
-Release:	3%{?_dist_release}
+Version:	0.8.3
+Release:	1%{?_dist_release}
 License:	GPLv2
 License:	GPLv2
 Group:		Applications/System
 Group:		Applications/System
 Source0:	http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
 Source0:	http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -29,6 +29,7 @@ BuildRequires:	polkit-devel
 BuildRequires:	NetworkManager-devel
 BuildRequires:	NetworkManager-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk3-devel
+BuildRequires:	gtk2-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	apt-devel
 BuildRequires:	apt-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
@@ -80,11 +81,16 @@ PackageKit の HTML ドキュメント
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch100 -p1 -b .vine
+#%patch100 -p1 -b .vine
 
 
 %build
 %build
 autoreconf -if
 autoreconf -if
-%configure --disable-static --enable-aptcc --disable-qt --with-default-backend=aptcc
+%configure \
+	--disable-static \
+	--disable-systemd \
+	--disable-qt 
+#	--enable-aptcc \
+#	--with-default-backend=aptcc
 %{__make} %{?_smp_mflags}
 %{__make} %{?_smp_mflags}
 
 
 %install
 %install
@@ -117,7 +123,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc AUTHORS COPYING HACKING MAINTAINERS NEWS README TODO
 %doc AUTHORS COPYING HACKING MAINTAINERS NEWS README TODO
 %{_sysconfdir}/PackageKit
 %{_sysconfdir}/PackageKit
-%{_sysconfdir}/apt/apt.conf.d/20packagekit
+#%{_sysconfdir}/apt/apt.conf.d/20packagekit
 %{_sysconfdir}/bash_completion.d/pk-completion.bash
 %{_sysconfdir}/bash_completion.d/pk-completion.bash
 %{_sysconfdir}/cron.daily/packagekit-background.cron
 %{_sysconfdir}/cron.daily/packagekit-background.cron
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf
@@ -132,14 +138,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib
 %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib
 %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib
 %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop
+%{_libdir}/gtk-2.0/modules/libpk-gtk-module.so
 %{_libdir}/gtk-3.0/modules/libpk-gtk-module.so
 %{_libdir}/gtk-3.0/modules/libpk-gtk-module.so
 %{_libdir}/libpackagekit-glib2.so.*
 %{_libdir}/libpackagekit-glib2.so.*
 %{_libdir}/packagekit-backend
 %{_libdir}/packagekit-backend
 %{_libdir}/packagekit-plugins
 %{_libdir}/packagekit-plugins
 %{_libdir}/pm-utils/sleep.d/95packagekit
 %{_libdir}/pm-utils/sleep.d/95packagekit
 %{_libexecdir}/packagekitd
 %{_libexecdir}/packagekitd
+%{_libexecdir}/pk-clear-offline-update
 %{_libexecdir}/pk-command-not-found
 %{_libexecdir}/pk-command-not-found
 %{_libexecdir}/pk-gstreamer-install
 %{_libexecdir}/pk-gstreamer-install
+%{_libexecdir}/pk-offline-update
+%{_libexecdir}/pk-trigger-offline-update
 %{_sbindir}/pk-device-rebind
 %{_sbindir}/pk-device-rebind
 %{_datadir}/PackageKit
 %{_datadir}/PackageKit
 %{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml
@@ -147,6 +157,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/dbus-1/system-services/org.freedesktop.PackageKit.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.PackageKit.service
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
 %{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir
 %{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.gtk-modules-packagekit.gschema.xml
 %{_mandir}/man1/pk-debuginfo-install.1*
 %{_mandir}/man1/pk-debuginfo-install.1*
 %{_mandir}/man1/pk-device-rebind.1.gz
 %{_mandir}/man1/pk-device-rebind.1.gz
 %{_mandir}/man1/pkcon.1*
 %{_mandir}/man1/pkcon.1*
@@ -158,7 +169,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/polkit-1/actions/org.freedesktop.packagekit.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.packagekit.policy
 %{_localstatedir}/lib/PackageKit/transactions.db
 %{_localstatedir}/lib/PackageKit/transactions.db
 
 
-%exclude %{_datadir}/PackageKit/website
+#%exclude %{_datadir}/PackageKit/website
 
 
 %files devel
 %files devel
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -171,9 +182,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files doc
 %files doc
 %defattr(-, root, root)
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/PackageKit
 %{_datadir}/gtk-doc/html/PackageKit
-%{_datadir}/PackageKit/website
+#%{_datadir}/PackageKit/website
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.3-1
+- new upstream release
+- drop Patch100
+- add BuildRequires: gtk2-devel
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.1-3
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.1-3
 - rebuild with python-2.7.2
 - rebuild with python-2.7.2
 
 

+ 12 - 5
W/WebKit/WebKit-vl.spec

@@ -15,7 +15,7 @@
 %bcond_with	wml
 %bcond_with	wml
 
 
 Name:		WebKit
 Name:		WebKit
-Version:	1.8.3
+Version:	1.10.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -28,13 +28,14 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: yasumichi
 Packager: yasumichi
 
 
-Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.xz
+Source0:	http://www.webkitgtk.org/webkitgtk-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildRequires:	bison
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	flex
 BuildRequires:	gperf
 BuildRequires:	gperf
+BuildRequires:	ruby
 BuildRequires:	gtk2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libjpeg-turbo-devel
@@ -105,16 +106,18 @@ AUTHORS files.
 
 
 
 
 %prep
 %prep
-%setup -q -n webkit-%{version}
+%setup -q -n webkitgtk-%{version}
 
 
 %build
 %build
 %configure \
 %configure \
 --with-gtk=2.0 \
 --with-gtk=2.0 \
+--disable-webkit2 \
 --enable-icon-database \
 --enable-icon-database \
 --enable-jit \
 --enable-jit \
 --enable-geolocation \
 --enable-geolocation \
 --enable-introspection=yes \
 --enable-introspection=yes \
 --enable-webgl \
 --enable-webgl \
+--enable-dependency-tracking \
 %{?with_coverage:       --enable-coverage               }       \
 %{?with_coverage:       --enable-coverage               }       \
 %{?with_pango:          --with-font-backend=pango       }       \
 %{?with_pango:          --with-font-backend=pango       }       \
 %{?with_wml:            --enable-wml                    }
 %{?with_wml:            --enable-wml                    }
@@ -148,7 +151,7 @@ install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 %add_to_doc_files Source/JavaScriptCore/icu/README
 %add_to_doc_files Source/JavaScriptCore/icu/README
 %add_to_doc_files Source/JavaScriptCore/icu/LICENSE
 %add_to_doc_files Source/JavaScriptCore/icu/LICENSE
 
 
-%find_lang webkit-2.0
+%find_lang webkitgtk-2.0
 
 
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
@@ -167,7 +170,7 @@ fi
 
 
 
 
 # %files -f webkit.lang gtk
 # %files -f webkit.lang gtk
-%files gtk -f webkit-2.0.lang
+%files gtk -f webkitgtk-2.0.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc
 %doc
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
@@ -191,6 +194,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.10.0-1
+- new upstream release
+- add BuildRequires: ruby
+
 * Tue Aug 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.3-1
 * Tue Aug 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.3-1
 - new upstream release
 - new upstream release
 
 

+ 20 - 7
W/WebKit3/WebKit3-vl.spec

@@ -15,7 +15,7 @@
 %bcond_with	wml
 %bcond_with	wml
 
 
 Name:		WebKit3
 Name:		WebKit3
-Version:	1.8.3
+Version:	1.10.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -28,14 +28,16 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: Takemikaduchi
 Packager: Takemikaduchi
 
 
-Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.xz
+Source0:	http://www.webkitgtk.org/webkitgtk-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildRequires:	bison
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	flex
 BuildRequires:	gperf
 BuildRequires:	gperf
+BuildRequires:	ruby
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk3-devel
+BuildRequires:	gtk2-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libtool
 BuildRequires:	libtool
@@ -45,8 +47,8 @@ BuildRequires:	pcre-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:  geoclue-devel
 BuildRequires:  geoclue-devel
 BuildRequires:  gcr-devel
 BuildRequires:  gcr-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gstreamer1-devel
+BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  enchant-devel
 BuildRequires:  enchant-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gsettings-desktop-schemas
 BuildRequires:  gsettings-desktop-schemas
@@ -105,17 +107,20 @@ AUTHORS files.
 
 
 
 
 %prep
 %prep
-%setup -q -n webkit-%{version}
+%setup -q -n webkitgtk-%{version}
 
 
 %build
 %build
 %configure \
 %configure \
 --with-gtk=3.0 \
 --with-gtk=3.0 \
+--with-gstreamer=1.0 \
 --enable-icon-database \
 --enable-icon-database \
 --enable-geolocation \
 --enable-geolocation \
 --enable-introspection=yes \
 --enable-introspection=yes \
+--enable-dependency-tracking \
 %{?with_coverage:       --enable-coverage               }       \
 %{?with_coverage:       --enable-coverage               }       \
 %{?with_pango:          --with-font-backend=pango       }       \
 %{?with_pango:          --with-font-backend=pango       }       \
 %{?with_wml:            --enable-wml                    }
 %{?with_wml:            --enable-wml                    }
+
 make V=1 %{?_smp_mflags}
 make V=1 %{?_smp_mflags}
 
 
 # workaround for bug 488112
 # workaround for bug 488112
@@ -148,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
 %add_to_doc_files Source/JavaScriptCore/icu/README
 %add_to_doc_files Source/JavaScriptCore/icu/README
 %add_to_doc_files Source/JavaScriptCore/icu/LICENSE
 %add_to_doc_files Source/JavaScriptCore/icu/LICENSE
 
 
-%find_lang webkit-3.0
+%find_lang webkitgtk-3.0
 
 
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
@@ -167,11 +172,13 @@ fi
 
 
 
 
 # %files -f webkit.lang gtk
 # %files -f webkit.lang gtk
-%files gtk -f webkit-3.0.lang
+%files gtk -f webkitgtk-3.0.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc
 %doc
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 %{_libexecdir}/WebKit3/
 %{_libexecdir}/WebKit3/
+%{_libexecdir}/WebKitPluginProcess
+%{_libexecdir}/WebKitWebProcess
 %{_bindir}/jsc-3
 %{_bindir}/jsc-3
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/webkitgtk-3.0/*
 %{_datadir}/webkitgtk-3.0/*
@@ -189,6 +196,12 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.10.0-1
+- new upstream release
+- add BuildRequires: ruby, gtk2-devel
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: gstreamer1-plugins-base-devel instead of gstreamer-pluings-base-devel
+
 * Tue Aug 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.3-1
 * Tue Aug 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.8.3-1
 - new upstream release
 - new upstream release
 
 

+ 10 - 7
a/accerciser/accerciser-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 3.4.1
+%define pkg_version 3.6.0
 %define pkg_release 1%{?_dist_release}
 %define pkg_release 1%{?_dist_release}
 
 
 Summary:	An interactive Python accessibility explorer for the GNOME desktop.
 Summary:	An interactive Python accessibility explorer for the GNOME desktop.
@@ -6,7 +6,7 @@ Summary(ja):	GNOME デスクトップ用 Python アクセシビリティエク
 Name:		accerciser
 Name:		accerciser
 Version:	%{pkg_version}
 Version:	%{pkg_version}
 Release:	%{pkg_release}
 Release:	%{pkg_release}
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/accerciser/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/accerciser/3.6/%{name}-%{version}.tar.xz
 License:	BSD
 License:	BSD
 Group:		Desktop/Accessibility 
 Group:		Desktop/Accessibility 
 URL:		http://live.gnome.org/Accerciser
 URL:		http://live.gnome.org/Accerciser
@@ -27,8 +27,8 @@ BuildRequires:	gtk3-devel
 BuildRequires:	at-spi2-core-devel
 BuildRequires:	at-spi2-core-devel
 BuildRequires:	pyatspi
 BuildRequires:	pyatspi
 BuildRequires:	glib2-devel >= 2.26.0
 BuildRequires:	glib2-devel >= 2.26.0
-BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	docbook-dtds
 BuildRequires:	docbook-dtds
+BuildRequires:	yelp-tools
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
@@ -50,13 +50,14 @@ you can use to create custom views of accessibility information.
 
 
 
 
 %build
 %build
-%configure  --disable-scrollkeeper --without-pyreqs
+%configure  --disable-static
 %{__make} %{?_smp_mflags}
 %{__make} %{?_smp_mflags}
 
 
 %install
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 
+%find_lang %{name} --with-gnome --all-name
 
 
 %clean
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -77,7 +78,7 @@ fi
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/accerciser
 %{_bindir}/accerciser
@@ -85,13 +86,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_datadir}/applications/accerciser.desktop
 %{_datadir}/applications/accerciser.desktop
 %{_datadir}/accerciser/*
 %{_datadir}/accerciser/*
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/gnome/help/accerciser/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/locale/*/*/accerciser*
 %{_mandir}/man1/accerciser.1.gz
 %{_mandir}/man1/accerciser.1.gz
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gome-doc-utils
+
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 - remove BuildRequires: GConf2-devel
 - remove BuildRequires: GConf2-devel

+ 4 - 1
a/accountsservice/accountsservice-vl.spec

@@ -1,6 +1,6 @@
 
 
 Name:           accountsservice
 Name:           accountsservice
-Version:        0.6.18
+Version:        0.6.25
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
 
@@ -92,6 +92,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_datadir}/gir-1.0/AccountsService-1.0.gir
 %{_datadir}/gir-1.0/AccountsService-1.0.gir
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.25-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.18-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.18-1
 - new upstream release
 - new upstream release
 
 

+ 11 - 5
a/acpid/acpid-vl.spec

@@ -1,21 +1,19 @@
 Summary: ACPI Event Daemon
 Summary: ACPI Event Daemon
 Summary(ja): ACPI イベントデーモン
 Summary(ja): ACPI イベントデーモン
 Name: acpid
 Name: acpid
-Version: 2.0.14
+Version: 2.0.17
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPL
 License: GPL
 Group: System Environment/Daemons
 Group: System Environment/Daemons
 URL: http://tedfelix.com/linux/acpid-netlink.html
 URL: http://tedfelix.com/linux/acpid-netlink.html
 
 
-Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz
+Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz
 Source1: acpid.init
 Source1: acpid.init
 Source2: acpid.video.conf
 Source2: acpid.video.conf
 Source3: acpid.power.conf
 Source3: acpid.power.conf
 Source4: acpid.power.sh
 Source4: acpid.power.sh
 Source6: acpid.sysconfig
 Source6: acpid.sysconfig
 
 
-Patch1: acpid-2.0.2-makefile.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): chkconfig
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
@@ -37,9 +35,9 @@ acpidはACPIイベントをユーザスペースのプログラムへ素早く
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch1 -p1 -b .makefile
 
 
 %build
 %build
+%configure
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
 
 
@@ -61,6 +59,8 @@ install -m 755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/actions/power.sh
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid
 install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/acpid
 install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/acpid
 
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -103,12 +103,18 @@ fi
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid
 %{_bindir}/acpi_listen
 %{_bindir}/acpi_listen
 %{_sbindir}/acpid
 %{_sbindir}/acpid
+%{_sbindir}/kacpimon
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
 %{_mandir}/man8/acpid.8*
 %{_mandir}/man8/acpid.8*
 %{_mandir}/man8/acpi_listen.8*
 %{_mandir}/man8/acpi_listen.8*
+%{_mandir}/man8/kacpimon.8*
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.17-1
+- new upstream release 
+- remove Patch1 (acpid-2.0.2-makefile.patch)
+
 * Wed Feb 15 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.14-1
 * Wed Feb 15 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.14-1
 - new upstream release 
 - new upstream release 
 
 

+ 6 - 3
a/alacarte/alacarte-vl.spec

@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 
 Name:           alacarte
 Name:           alacarte
-Version:        0.13.4
-Release:        2%{?_dist_release}
+Version:        3.5.5
+Release:        1%{?_dist_release}
 Summary:        Menu editor for the GNOME desktop
 Summary:        Menu editor for the GNOME desktop
 Summary(ja):    GNOME デスクトップ用メニューエディタ
 Summary(ja):    GNOME デスクトップ用メニューエディタ
 
 
@@ -10,7 +10,7 @@ Group:          Applications/System
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.gnome.org
 URL:            http://www.gnome.org
 
 
-Source0:        http://download.gnome.org/sources/alacarte/0.13/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/alacarte/3.5/%{name}-%{version}.tar.xz
 
 
 Patch0:		alacarte-0.13.4-getIcon.patch
 Patch0:		alacarte-0.13.4-getIcon.patch
 
 
@@ -82,6 +82,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.5.5-1
+- new upstream release
+
 * Wed Jun 13 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.13.4-2
 * Wed Jun 13 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.13.4-2
 - add Patch0 (alacarte-0.13.4-getIcon.patch) 
 - add Patch0 (alacarte-0.13.4-getIcon.patch) 
 
 

+ 6 - 6
a/anjuta-extras/anjuta-extras-vl.spec

@@ -1,9 +1,9 @@
-Version:	3.4.0
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 
 
 Summary:	Several non-core plugins for anjuta
 Summary:	Several non-core plugins for anjuta
 Name:		anjuta-extras
 Name:		anjuta-extras
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 License:	GPL2
 License:	GPL2
 Group:		Applications/Development
 Group:		Applications/Development
 URL: 		http://projects.gnome.org/anjuta/
 URL: 		http://projects.gnome.org/anjuta/
@@ -43,11 +43,9 @@ scintillaプラグインを含んでいます。
 
 
 %install
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
-%find_lang %{name}
+%find_lang %{name} --all-name --with-gnome
 
 
 # remove no install files
 # remove no install files
 
 
@@ -76,12 +74,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/anjuta/ui/anjuta-sample.ui
 %{_datadir}/anjuta/ui/anjuta-sample.ui
 %{_datadir}/anjuta/ui/anjuta-scintilla.xml
 %{_datadir}/anjuta/ui/anjuta-scintilla.xml
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/gnome/help/anjuta-manual
 %{_datadir}/pixmaps/anjuta/anjuta-*.png
 %{_datadir}/pixmaps/anjuta/anjuta-*.png
 %{_datadir}/pixmaps/anjuta/anjuta-*.svg
 %{_datadir}/pixmaps/anjuta/anjuta-*.svg
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Wed Apr 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Wed Apr 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 - add BuildRequires: gnome-doc-utils
 - add BuildRequires: gnome-doc-utils

+ 11 - 7
a/anjuta/anjuta-vl.spec

@@ -1,4 +1,4 @@
-%define	pkg_version	3.4.4
+%define	pkg_version	3.6.0
 
 
 %define	glib_required		2.32.0
 %define	glib_required		2.32.0
 %define	gtk_required		3.4.0
 %define	gtk_required		3.4.0
@@ -36,7 +36,7 @@ Source:		%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
-Packager:	yasumichi,inagaki
+Packager:	yasumichi,inagaki,Takemikaduchi
 
 
 Requires:	autogen
 Requires:	autogen
 Requires:	gdb
 Requires:	gdb
@@ -100,7 +100,7 @@ BuildRequires:	libSM-devel
 #BuildRequires:	binutils-devel
 #BuildRequires:	binutils-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	gtksourceview3-devel
 BuildRequires:	gtksourceview3-devel
-BuildRequires:	gnome-doc-utils
+BuildRequires:	yelp-tools
 BuildRequires:	vala-devel >= %{vala_required}
 BuildRequires:	vala-devel >= %{vala_required}
 BuildRequires:	vala-tools
 BuildRequires:	vala-tools
 BuildRequires:	sqlite3-devel
 BuildRequires:	sqlite3-devel
@@ -179,7 +179,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
-%find_lang %{name}
+%find_lang %{name} --all-name --with-gnome
 
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -238,9 +238,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 #%%files docs
 #%%files docs
 #%%defattr(-, root, root)
 #%%defattr(-, root, root)
-%{_datadir}/gnome/help/%{name}-faqs
-%{_datadir}/gnome/help/%{name}-manual
-%{_datadir}/gnome/help/%{name}-build-tutorial
+#%{_datadir}/gnome/help/%{name}-faqs
+#%{_datadir}/gnome/help/%{name}-manual
+#%{_datadir}/gnome/help/%{name}-build-tutorial
 
 
 %files libs
 %files libs
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -258,6 +258,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 - new upstream release
 - new upstream release
 
 

+ 33 - 11
a/at-spi2-atk/at-spi2-atk-vl.spec

@@ -1,5 +1,5 @@
 Name:           at-spi2-atk
 Name:           at-spi2-atk
-Version:        2.4.0
+Version:        2.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A GTK+ module that bridges ATK to D-Bus at-spi
 Summary:        A GTK+ module that bridges ATK to D-Bus at-spi
 
 
@@ -7,7 +7,7 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 #VCS: git:git://git.gnome.org/at-spi-atk
 #VCS: git:git://git.gnome.org/at-spi-atk
-Source0:        http://download.gnome.org/sources/at-spi2-atk/2.4/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/at-spi2-atk/2.6/%{name}-%{version}.tar.xz
 
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-devel
@@ -15,7 +15,6 @@ BuildRequires:  dbus-glib-devel
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  atk-devel
 BuildRequires:  atk-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libSM-devel
 BuildRequires:  intltool
 BuildRequires:  intltool
 
 
@@ -39,11 +38,23 @@ This package includes a gtk-module that bridges ATK to the new
 D-Bus based at-spi.
 D-Bus based at-spi.
 
 
 
 
+%package        devel
+Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発ファイル
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
 %build
 %build
-%configure --disable-relocate
+%configure --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 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
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 
@@ -53,10 +64,8 @@ make %{?_smp_mflags}
 %install
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libatk-bridge.la
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/libatk-bridge.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
-%find_lang %{name}
 
 
 %postun
 %postun
 if [ $1 -eq 0 ]; then
 if [ $1 -eq 0 ]; then
@@ -66,19 +75,32 @@ fi
 %posttrans
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
-%files -f %{name}.lang
+%files
+%defattr(-,root,root,-)
 %doc COPYING AUTHORS README
 %doc COPYING AUTHORS README
+%{_libdir}/libatk-bridge-2.0.so.*
 %dir %{_libdir}/gtk-2.0
 %dir %{_libdir}/gtk-2.0
 %dir %{_libdir}/gtk-2.0/modules
 %dir %{_libdir}/gtk-2.0/modules
 %{_libdir}/gtk-2.0/modules/libatk-bridge.so
 %{_libdir}/gtk-2.0/modules/libatk-bridge.so
-%dir %{_libdir}/gtk-3.0
-%dir %{_libdir}/gtk-3.0/modules
-%{_libdir}/gtk-3.0/modules/libatk-bridge.so
+%dir %{_libdir}/gnome-settings-daemon-3.0
+%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/
+%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
 %{_datadir}/glib-2.0/schemas/org.a11y.atspi.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.a11y.atspi.gschema.xml
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
 
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+%{_libdir}/libatk-bridge-2.0.so
+%{_libdir}/pkgconfig/atk-bridge-2.0.pc
+
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.0-1
+- new upstream release
+- remove BuildRequires: gtk2-devel
+- create -devel subpackage
+
 * Sun Apr 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
 * Sun Apr 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
a/at-spi2-core/at-spi2-core-vl.spec

@@ -1,14 +1,14 @@
 %bcond_with firstbuild
 %bcond_with firstbuild
 
 
 Name:           at-spi2-core
 Name:           at-spi2-core
-Version:        2.4.2
+Version:        2.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Protocol definitions and daemon for D-Bus at-spi
 Summary:        Protocol definitions and daemon for D-Bus at-spi
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
 URL:            http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
-Source0:        http://download.gnome.org/sources/at-spi2-core/2.4/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/at-spi2-core/2.6/%{name}-%{version}.tar.xz
 
 
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  dbus-glib-devel
@@ -91,6 +91,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la
 %{_libdir}/pkgconfig/atspi-2.pc
 %{_libdir}/pkgconfig/atspi-2.pc
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.0-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 3
a/atk/atk-vl.spec

@@ -8,11 +8,11 @@
 Summary: Interfaces for accessibility support.
 Summary: Interfaces for accessibility support.
 Summary(ja): アクセシビリティサポートのためのインタフェース
 Summary(ja): アクセシビリティサポートのためのインタフェース
 Name: atk
 Name: atk
-Version: 2.4.0
+Version: 2.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: LGPL
 License: LGPL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/atk/2.2/atk-%{version}.tar.xz
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/atk/2.6/atk-%{version}.tar.xz
 URL: http://developer.gnome.org/projects/gap/
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -122,10 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -n compat32-%{name}-devel
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
 %defattr(-, root, root)
 %{_libdir}/libatk*.so
 %{_libdir}/libatk*.so
-%{_libdir}/pkgconfig/*.pc
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.0-1
+- new upstream release
+
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 4
b/banshee/banshee-vl.spec

@@ -1,12 +1,10 @@
 Summary:	A multimedia management and playback application for GNOME
 Summary:	A multimedia management and playback application for GNOME
 Name:		banshee
 Name:		banshee
-Version:	2.4.1
+Version:	2.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 
 
 Source0:	%{name}-%{version}.tar.xz
 Source0:	%{name}-%{version}.tar.xz
 
 
-Patch0:		banshee-2.4.1-missing_cast.patch
-
 License:	MIT/X11
 License:	MIT/X11
 Group:		Applications/Multimedia
 Group:		Applications/Multimedia
 URL:		http://banshee.fm/
 URL:		http://banshee.fm/
@@ -74,7 +72,6 @@ banshee.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .cast
 
 
 %build
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
@@ -154,6 +151,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Mon Oct 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.0-1
+- new upstream release
+- remove Patch0 (banshee-2.4.1-missing_cast.patch)
+
 * Sun Jun 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.1-1
 * Sun Jun 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.1-1
 - initial build for Vine Linux
 - initial build for Vine Linux
 
 

+ 40 - 41
b/baobab/baobab-vl.spec

@@ -1,5 +1,5 @@
 %define name	baobab
 %define name	baobab
-%define version	2.4.2
+%define version	3.6.0
 %define release	1%{?_dist_release}
 %define release	1%{?_dist_release}
 
 
 Summary:	A graphical disk usage analyzer
 Summary:	A graphical disk usage analyzer
@@ -7,23 +7,22 @@ Summary(ja): 	グラフィカルなハードディスク使用量の分析ツー
 Name:		%{name}
 Name:		%{name}
 Version:	%{version}
 Version:	%{version}
 Release: 	%{release}
 Release: 	%{release}
-Source0:	%{name}-%{version}.tar.gz
-Patch1:		baobab-2.4.2-fix-encoding.patch
-Patch2:		baobab-2.4.2-ja.po.patch
-License:	GPL
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+License:	GPLv2+
 Group:		User Interface/Desktops
 Group:		User Interface/Desktops
-URL:		http://www.marzocca.net/linux/baobab.html
-
-Requires:	gtk2 >= 2.6.0
-Requires:	libgtop2 >= 2.10.0, libgnomeui >= 2.0.0
-Requires:	libgnomecanvas >= 2.10.2, gnome-vfs2 >= 2.6.0
-Requires:	libglade2 >= 2.5.1, GConf2
-BuildRequires:	gtk2-devel >= 2.6.0
-BuildRequires:	libgtop2-devel >= 2.10.0, libgnomeui-devel >= 2.0.0
-BuildRequires:	libgnomecanvas-devel >= 2.10.2, gnome-vfs2-devel >= 2.6.0
-BuildRequires:	libglade2-devel >= 2.5.1, GConf2-devel
+URL:		http://www.gnome.org
+
+BuildRequires:	gtk3-devel
+BuildRequires:	itstool
+
+Requires(postun,posttrans):	glib2
+Requires(postun,posttrans):	desktop-file-utils
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
 
 
 %description
 %description
 A graphical tool to analyse disk usage in local and remote filesystems.
 A graphical tool to analyse disk usage in local and remote filesystems.
@@ -48,53 +47,53 @@ Baobab は、各ディレクトリのサイズと使用量をグラフィカル
 %prep
 %prep
 
 
 %setup -q
 %setup -q
-%patch1 -p1 -b .fix-encoding
-%patch2 -p1 -b .updated
 
 
 %build
 %build
 %configure
 %configure
-%__make
+make %{?_smp_mflags}
 
 
 
 
 %install
 %install
-%__rm -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+rm -rf $RPM_BUILD_ROOT
 
 
-%find_lang %{name}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
-# remove unnecessary files
-%__rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/icon-theme.cache
+%find_lang %{name} --all-name --with-gnome
 
 
 
 
 %clean
 %clean
-%__rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %post
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-    %{_sysconfdir}/gconf/schemas/baobab.schemas > /dev/null
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 
+%postun
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
 
 
-%preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/baobab.schemas >/dev/null;
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/baobab
-%{_datadir}/applications/baobab.desktop
-%{_datadir}/baobab
-%{_datadir}/icons/hicolor/48x48/apps/baobab.png
-%{_sysconfdir}/gconf/schemas/baobab.schemas
-%{_mandir}/man1/baobab.1*
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/pixmaps/shot.png
+%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- remove old patches and required packages
+
 * Sat Sep 06 2008 Shu KONNO <owa@bg.wakwak.com> 2.4.2-1vl5
 * Sat Sep 06 2008 Shu KONNO <owa@bg.wakwak.com> 2.4.2-1vl5
 - applied new versioning policy, spec in utf-8
 - applied new versioning policy, spec in utf-8
 
 

+ 5 - 2
b/blueman/blueman-vl.spec

@@ -31,9 +31,11 @@ Requires:	pygtk2
 Requires:	gnome-python
 Requires:	gnome-python
 Requires:	dbus-python
 Requires:	dbus-python
 Requires:	pygobject
 Requires:	pygobject
-Requires:	PolicyKit-gnome
+Requires:	polkit-gnome
 Provides:       dbus-bluez-pin-helper
 Provides:       dbus-bluez-pin-helper
 
 
+Obsoletes: 	bluez-gnome < 1.9
+
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: daisuke
 Packager: daisuke
@@ -141,8 +143,9 @@ fi
 
 
 
 
 %changelog
 %changelog
-* Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.23-2
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.23-2
 - rebuild with python-2.7.2
 - rebuild with python-2.7.2
+- change Requires: polkit-gnome instead of PolicyKit-gnome
 
 
 * Tue Jan 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.23-1
 * Tue Jan 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.23-1
 - new upstream release
 - new upstream release

+ 12 - 7
b/brasero/brasero-vl.spec

@@ -2,12 +2,12 @@ Summary:   Gnome CD/DVD burning application
 Summary(ja): Gnome CD/DVD 書き込みアプリケーション
 Summary(ja): Gnome CD/DVD 書き込みアプリケーション
 
 
 Name:      brasero
 Name:      brasero
-Version:   3.4.1
+Version:   3.6.0
 Release:   1%{?_dist_release}
 Release:   1%{?_dist_release}
 Group:     Applications/Multimedia
 Group:     Applications/Multimedia
 License:   GPLv2+
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/3.4/%{name}-%{version}.tar.xz
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -15,13 +15,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  glib2-devel >= 2.32.0
 BuildRequires:  glib2-devel >= 2.32.0
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
 BuildRequires:  desktop-file-utils
-BuildRequires:  gstreamer-devel >= 0.10.15
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
+BuildRequires:  gstreamer1-devel >= 0.11.92
+BuildRequires:  gstreamer1-plugins-base-devel >= 0.11.92
 BuildRequires:  totem-pl-parser-devel >= 2.32.0
 BuildRequires:  totem-pl-parser-devel >= 2.32.0
 BuildRequires:  libnotify-devel >= 0.4.5
 BuildRequires:  libnotify-devel >= 0.4.5
 BuildRequires:  libxml2-devel >= 2.7.7
 BuildRequires:  libxml2-devel >= 2.7.7
 BuildRequires:  dbus-glib-devel >= 0.88
 BuildRequires:  dbus-glib-devel >= 0.88
-BuildRequires:  gnome-doc-utils >= 0.3.2
+BuildRequires:  yelp-tools
 BuildRequires:  scrollkeeper
 BuildRequires:  scrollkeeper
 BuildRequires:  libxslt
 BuildRequires:  libxslt
 BuildRequires:  libburn-devel >= 0.4.0
 BuildRequires:  libburn-devel >= 0.4.0
@@ -113,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang %{name}
+%find_lang %{name} --all-name --with-gnome
 
 
 desktop-file-install --vendor ""                   \
 desktop-file-install --vendor ""                   \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
@@ -174,7 +174,6 @@ fi
 %{_datadir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-nautilus.desktop
 %{_datadir}/applications/%{name}-nautilus.desktop
-%{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/*
 %{_datadir}/mime/packages/*
 %{_datadir}/GConf/gsettings/brasero.convert
 %{_datadir}/GConf/gsettings/brasero.convert
@@ -201,6 +200,12 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: gstreamer1-plugins-base-devel instead of gstreamer-plugins-base-devel
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 - remove BuildRequires: GConf2-devel
 - remove BuildRequires: GConf2-devel

+ 8 - 10
c/caribou/caribou-vl.spec

@@ -1,5 +1,5 @@
 Name:           caribou
 Name:           caribou
-Version:        0.4.3
+Version:        0.4.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A simplified in-place on-screen keyboard
 Summary:        A simplified in-place on-screen keyboard
 
 
@@ -8,15 +8,11 @@ License:        LGPLv2+
 URL:            http://live.gnome.org/Caribou
 URL:            http://live.gnome.org/Caribou
 Source0:        http://download.gnome.org/sources/caribou/0.4/caribou-%{version}.tar.xz
 Source0:        http://download.gnome.org/sources/caribou/0.4/caribou-%{version}.tar.xz
 
 
-Patch0:		caribou-0.4.3-revert_make_schema.patch
-
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  pygobject3-devel
 BuildRequires:  pygobject3-devel
-BuildRequires:  pyclutter-devel
 BuildRequires:  pyatspi
 BuildRequires:  pyatspi
-#BuildRequires:  python-virtkey
 BuildRequires:  intltool
 BuildRequires:  intltool
 BuildRequires:  gnome-doc-utils
 BuildRequires:  gnome-doc-utils
 BuildRequires:  desktop-file-utils
 BuildRequires:  desktop-file-utils
@@ -26,15 +22,13 @@ BuildRequires:  vala-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  json-glib-devel
 BuildRequires:  json-glib-devel
-BuildRequires:  libgee-devel
+BuildRequires:  libgee06-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gnome-python-devel
 BuildRequires:  gnome-python-devel
 
 
 Requires:       pygtk2
 Requires:       pygtk2
 Requires:       gnome-python
 Requires:       gnome-python
 Requires:       pyatspi
 Requires:       pyatspi
-Requires:       pyclutter
-#Requires:       python-virtkey
 
 
 %description
 %description
 Caribou is a text entry application that currently manifests itself as
 Caribou is a text entry application that currently manifests itself as
@@ -51,8 +45,6 @@ developing applications that use %{name}.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .revert
-
 
 
 %build
 %build
 %configure --disable-static
 %configure --disable-static
@@ -104,6 +96,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gir-1.0/Caribou-1.0.gir
 %{_datadir}/gir-1.0/Caribou-1.0.gir
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.4.4-1
+- new upstream release
+- remove Patch0 (caribou-0.4.3-revert_make_schema.patch)
+- remove BuildRequires: pyclutter
+- change BuildRequires: libgee06-devel instead of libgee-dvel
+
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.4.3-1
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.4.3-1
 - new upstream release
 - new upstream release
 - add Patch0 (caribou-0.4.3-revert_make_schema.patch)
 - add Patch0 (caribou-0.4.3-revert_make_schema.patch)

+ 17 - 10
c/cheese/cheese-vl.spec

@@ -2,19 +2,20 @@ Summary:        A webcam application for snapshots and movies
 Summary(ja):    スナップショットとムービーを撮るためのウェブカメラアプリケーション
 Summary(ja):    スナップショットとムービーを撮るためのウェブカメラアプリケーション
 
 
 Name:           cheese
 Name:           cheese
-Version:        3.4.2
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
 Group:          Applications/Multimedia
 Group:          Applications/Multimedia
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
 URL:            http://live.gnome.org/Cheese
-Source0:        http://download.gnome.org/sources/cheese/3.4/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/cheese/3.6/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires: gtk3-devel >= 3.4.1
 BuildRequires: gtk3-devel >= 3.4.1
 BuildRequires: gnome-desktop3-devel >= 3.4.1
 BuildRequires: gnome-desktop3-devel >= 3.4.1
-BuildRequires: gstreamer-devel >= 0.10.30
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.30
+BuildRequires: gstreamer1-devel >= 0.11.0
+BuildRequires: gstreamer1-plugins-base-devel >= 0.11.0
+BuildRequires: gstreamer1-plugins-bad-free-devel >= 0.11.0
 BuildRequires: evolution-data-server-devel >= 3.4.1
 BuildRequires: evolution-data-server-devel >= 3.4.1
 BuildRequires: cairo-devel >= 1.12.0
 BuildRequires: cairo-devel >= 1.12.0
 BuildRequires: dbus-devel >= 1.4.0
 BuildRequires: dbus-devel >= 1.4.0
@@ -24,8 +25,8 @@ BuildRequires: librsvg2-devel >= 2.32.0
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 BuildRequires: perl(XML::Parser)
-BuildRequires: gnome-doc-utils
 BuildRequires: autoconf, automake, libtool, intltool
 BuildRequires: autoconf, automake, libtool, intltool
+BuildRequires: gnome-common
 BuildRequires: libgudev1-devel
 BuildRequires: libgudev1-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: clutter-devel
 BuildRequires: clutter-devel
@@ -33,11 +34,11 @@ BuildRequires: clutter-gtk-devel
 BuildRequires: clutter-gst-devel
 BuildRequires: clutter-gst-devel
 BuildRequires: libmx-devel
 BuildRequires: libmx-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXtst-devel
-BuildRequires: libgee-devel
+BuildRequires: libgee06-devel
+BuildRequires: yelp-tools
 BuildRequires: gnome-video-effects
 BuildRequires: gnome-video-effects
-BuildRequires: itstool
 
 
-Requires: gstreamer-plugins-good
+Requires: gstreamer1-plugins-good
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -64,15 +65,14 @@ for writing applications that require a webcam display widget.
 %setup -q
 %setup -q
 
 
 %build
 %build
+autoreconf -if
 %configure --disable-static
 %configure --disable-static
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 desktop-file-install --delete-original --vendor="" 	\
 desktop-file-install --delete-original --vendor="" 	\
  	--dir=$RPM_BUILD_ROOT%{_datadir}/applications 	\
  	--dir=$RPM_BUILD_ROOT%{_datadir}/applications 	\
@@ -127,6 +127,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/gtk-doc/html/cheese/*
 %{_datadir}/gtk-doc/html/cheese/*
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: gstreamer1-plugins-base-devel instead of gstreamer-plugins-base-devel
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+- add BuildRequires: gstreamer1-plugins-bad-free, gnome-common
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 21 - 30
c/cinnamon/cinnamon-vl.spec

@@ -1,16 +1,15 @@
 Name: 		cinnamon
 Name: 		cinnamon
 Summary: 	A Linux Desktop featuring a traditional layout and modern technology
 Summary: 	A Linux Desktop featuring a traditional layout and modern technology
-Version: 	1.4
-Release: 	1.UP1%{?_dist_release}
+Version: 	1.6.1
+Release: 	1%{?_dist_release}
 
 
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
 License:	GPLv2+
 License:	GPLv2+
 URL: 		http://cinnamon.linuxmint.com/
 URL: 		http://cinnamon.linuxmint.com/
 
 
-Source0: 	%{name}-%{version}-UP1.tar.gz
+Source0: 	linuxmint-Cinnamon-%{version}-0-g51bbcb4.tar.gz
 
 
 Patch0:		cinnamon-1.4-session.patch
 Patch0:		cinnamon-1.4-session.patch
-Patch1:		cinnamon-1.4-settings.patch
 
 
 # vine patch
 # vine patch
 Patch101:	cinnamon-vine-settings.patch
 Patch101:	cinnamon-vine-settings.patch
@@ -33,10 +32,11 @@ BuildRequires: 	libcroco-devel >= 0.6.2
 BuildRequires: 	gnome-desktop3-devel >= 2.90.0
 BuildRequires: 	gnome-desktop3-devel >= 2.90.0
 BuildRequires: 	pulseaudio-libs-devel
 BuildRequires: 	pulseaudio-libs-devel
 BuildRequires: 	libgudev1-devel
 BuildRequires: 	libgudev1-devel
+BuildRequires: 	libcanberra-gtk3-devel
+BuildRequires: 	GConf2-devel
 BuildRequires: 	gnome-common
 BuildRequires: 	gnome-common
 
 
-Requires(post,pre,preun): GConf2
-Requires:	glib2
+Requires(postun,posttrans):	glib2
 Requires:	muffin
 Requires:	muffin
 
 
 %description
 %description
@@ -47,9 +47,8 @@ The underlying technology is forked from Gnome Shell.
 The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience.
 The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience.
 
 
 %prep
 %prep
-%setup -q -n linuxmint-Cinnamon-af1653f
+%setup -q -n linuxmint-Cinnamon-1359845
 %patch0 -p1
 %patch0 -p1
-%patch1 -p1 
 %patch101 -p1 -b .vine
 %patch101 -p1 -b .vine
 
 
 %build
 %build
@@ -75,22 +74,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/cinnamon.schemas > /dev/null || :
-
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/cinnamon.schemas > /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/cinnamon.schemas > /dev/null || :
-fi
-
 %postun
 %postun
 if [ $1 -eq 0 ]; then
 if [ $1 -eq 0 ]; then
   glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
   glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
@@ -103,14 +86,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc README NEWS COPYING AUTHORS
 %doc README NEWS COPYING AUTHORS
-%{_sysconfdir}/gconf/schemas/cinnamon.schemas
 %{_sysconfdir}/xdg/menus/cinnamon-applications.menu
 %{_sysconfdir}/xdg/menus/cinnamon-applications.menu
 %{_sysconfdir}/xdg/menus/cinnamon-settings.menu
 %{_sysconfdir}/xdg/menus/cinnamon-settings.menu
 %{_bindir}/cinnamon
 %{_bindir}/cinnamon
 %{_bindir}/cinnamon-extension-tool
 %{_bindir}/cinnamon-extension-tool
+%{_bindir}/cinnamon-launcher
 %{_bindir}/cinnamon-menu-editor
 %{_bindir}/cinnamon-menu-editor
 %{_bindir}/cinnamon-settings
 %{_bindir}/cinnamon-settings
+%{_bindir}/cinnamon2d
 %{_bindir}/gnome-session-cinnamon
 %{_bindir}/gnome-session-cinnamon
+%{_bindir}/gnome-session-cinnamon2d
 %{_prefix}/lib/cinnamon-menu-editor
 %{_prefix}/lib/cinnamon-menu-editor
 %{_prefix}/lib/cinnamon-settings
 %{_prefix}/lib/cinnamon-settings
 %{_libdir}/%{name}/Cinnamon-0.1.typelib
 %{_libdir}/%{name}/Cinnamon-0.1.typelib
@@ -118,24 +103,30 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/%{name}/St-1.0.typelib
 %{_libdir}/%{name}/St-1.0.typelib
 %{_libdir}/%{name}/libcinnamon.so
 %{_libdir}/%{name}/libcinnamon.so
 %{_libdir}/mozilla/plugins/libcinnamon-browser-plugin.so
 %{_libdir}/mozilla/plugins/libcinnamon-browser-plugin.so
-%{_libexecdir}/cinnamon-calendar-server
-%{_libexecdir}/cinnamon-hotplug-sniffer
-%{_libexecdir}/cinnamon-perf-helper
+%{_libexecdir}/%{name}/cinnamon-hotplug-sniffer
+%{_libexecdir}/%{name}/cinnamon-perf-helper
 %{_datadir}/applications/cinnamon-settings.desktop
 %{_datadir}/applications/cinnamon-settings.desktop
 %{_datadir}/applications/cinnamon.desktop
 %{_datadir}/applications/cinnamon.desktop
+%{_datadir}/applications/cinnamon2d.desktop
 %{_datadir}/%{name}/applets
 %{_datadir}/%{name}/applets
 %{_datadir}/%{name}/js
 %{_datadir}/%{name}/js
 %{_datadir}/%{name}/search_providers
 %{_datadir}/%{name}/search_providers
 %{_datadir}/%{name}/shaders
 %{_datadir}/%{name}/shaders
 %{_datadir}/%{name}/theme
 %{_datadir}/%{name}/theme
-%{_datadir}/dbus-1/services/org.Cinnamon.CalendarServer.service
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 %{_datadir}/desktop-directories
 %{_datadir}/desktop-directories
 %{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
 %{_datadir}/gnome-session/sessions/cinnamon.session
 %{_datadir}/gnome-session/sessions/cinnamon.session
+%{_datadir}/gnome-session/sessions/cinnamon2d.session
 %{_datadir}/xsessions/cinnamon.desktop
 %{_datadir}/xsessions/cinnamon.desktop
-%{_mandir}/man1/cinnamon.1.gz
+%{_datadir}/xsessions/cinnamon2d.desktop
+%{_mandir}/man1/*.1.gz
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- update Patch101 (cinnamon-vine-settings.patch)
+- add BuildRequires: GConf2-devel, libcanberra-gtk3-devel
+
 * Tue Jun 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4-UP1-1
 * Tue Jun 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4-UP1-1
 - initial build for Vine Linux
 - initial build for Vine Linux

+ 4 - 1
c/clutter-gesture/clutter-gesture-vl.spec

@@ -1,6 +1,6 @@
 Name:           clutter-gesture
 Name:           clutter-gesture
 Version:        0.0.2.1
 Version:        0.0.2.1
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Summary:        Gesture Library for Clutter
 Summary:        Gesture Library for Clutter
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.2.1-4
+- rebuild with cogl-1.12.0
+
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.2.1-3
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.2.1-3
 - rebuild with cogl-1.10.0
 - rebuild with cogl-1.10.0
 
 

+ 13 - 9
c/clutter-gst/clutter-gst-vl.spec

@@ -1,8 +1,8 @@
-%define		clutter_gst_version 1.6
+%define		clutter_gst_version 1.9
 %define		clutter_gst_release 1%{?_dist_release}
 %define		clutter_gst_release 1%{?_dist_release}
 
 
 Name:           clutter-gst
 Name:           clutter-gst
-Version:        %{clutter_gst_version}.0
+Version:        %{clutter_gst_version}.92
 Release:        %{clutter_gst_release}
 Release:        %{clutter_gst_release}
 Summary:        ClutterMedia interface to GStreamer
 Summary:        ClutterMedia interface to GStreamer
 
 
@@ -12,7 +12,7 @@ URL:            http://www.clutter-project.org
 Source0:        http://www.clutter-project.org/sources/%{name}/1.6/%{name}-%{version}.tar.xz
 Source0:        http://www.clutter-project.org/sources/%{name}/1.6/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
+BuildRequires:  clutter-devel gstreamer1-plugins-base-devel gstreamer1-devel 
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gobject-introspection-devel
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -26,7 +26,7 @@ use with clutter
 Summary:        Clutter-gst development environment
 Summary:        Clutter-gst development environment
 Group:          Development/Libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
-Requires:       clutter-devel gstreamer-devel gstreamer-plugins-base-devel
+Requires:       clutter-devel gstreamer1-devel gstreamer1-plugins-base-devel
 
 
 %description devel
 %description devel
 Header files and libraries for building a extension library for the
 Header files and libraries for building a extension library for the
@@ -54,20 +54,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %doc AUTHORS COPYING README
-%{_libdir}/libclutter-gst-1.0.so.*
-%{_libdir}/gstreamer-0.10/libgstclutter.so
+%{_libdir}/libclutter-gst-2.0.so.*
+%{_libdir}/gstreamer-1.0/libgstclutter.so
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/gtk-doc/html/clutter-gst
 %{_datadir}/gtk-doc/html/clutter-gst
-%exclude %{_libdir}/libclutter-gst-1.0.la
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-1.0.pc
-%{_libdir}/libclutter-gst-1.0.so
+%{_libdir}/pkgconfig/clutter-gst-2.0.pc
+%{_libdir}/libclutter-gst-2.0.so
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gir-1.0/*.gir
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9.92-1
+- new upstream release
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: gstreamer1-plugins-base-devel instead of gstreamer-plugins-base-devel
+
 * Tue Jun 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
 * Tue Jun 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
c/clutter-gtk/clutter-gtk-vl.spec

@@ -1,8 +1,8 @@
-%define         clutter_gtk_version 1.2
+%define         clutter_gtk_version 1.3
 %define         clutter_gtk_release 1%{?_dist_release}
 %define         clutter_gtk_release 1%{?_dist_release}
 
 
 Name:           clutter-gtk
 Name:           clutter-gtk
-Version:        %{clutter_gtk_version}.0
+Version:        %{clutter_gtk_version}.2
 Release:        %{clutter_gtk_release}
 Release:        %{clutter_gtk_release}
 Summary:        A basic GTK clutter widget
 Summary:        A basic GTK clutter widget
 
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/GtkClutter-1.0.gir
 %{_datadir}/gir-1.0/GtkClutter-1.0.gir
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.2-1
+- new upstream release
+
 * Sun Apr 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-1
 * Sun Apr 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-1
 - new upstream release
 - new upstream release
 
 

+ 4 - 1
c/clutter-imcontext/clutter-imcontext-vl.spec

@@ -1,6 +1,6 @@
 Name:          clutter-imcontext
 Name:          clutter-imcontext
 Version:       0.1.6
 Version:       0.1.6
-Release:       3%{?_dist_release}
+Release:       4%{?_dist_release}
 Summary:       IMContext Framework Library for Clutter
 Summary:       IMContext Framework Library for Clutter
 
 
 Group:         System Environment/Libraries
 Group:         System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-4
+- rebuild with cogl-1.12.0
+
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-3
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-3
 - rebuild with cogl-1.10.0
 - rebuild with cogl-1.10.0
 
 

+ 6 - 3
c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.10.8
+%define         clutter_version 1.12.0
 %define         clutter_release 1%{?_dist_release}
 %define         clutter_release 1%{?_dist_release}
 
 
 Name:           clutter
 Name:           clutter
@@ -10,7 +10,7 @@ Summary(ja):    リッチなGUIを作成するためのオープンソースラ
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/1.10/%{name}-%{version}.tar.xz
+Source0:        http://www.clutter-project.org/sources/%{name}/1.12/%{name}-%{version}.tar.xz
 
 
 Patch0:		clutter-fixdso.patch
 Patch0:		clutter-fixdso.patch
 
 
@@ -33,7 +33,7 @@ BuildRequires:	gettext
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
 BuildRequires:  gobject-introspection-devel >= 0.9.5
 BuildRequires:  gobject-introspection-devel >= 0.9.5
 BuildRequires:	json-glib-devel
 BuildRequires:	json-glib-devel
-BuildRequires:	cogl-devel >= 1.10.0
+BuildRequires:	cogl-devel >= 1.12.0
 
 
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
@@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.0-1
+- new upstream release
+
 * Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.8-1
 * Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.8-1
 - new upstream release
 - new upstream release
 
 

+ 20 - 7
c/cogl/cogl-vl.spec

@@ -1,4 +1,4 @@
-%define         cogl_version 1.10.4
+%define         cogl_version 1.12.0
 %define         cogl_release 1%{?_dist_release}
 %define         cogl_release 1%{?_dist_release}
 
 
 Name:           cogl
 Name:           cogl
@@ -9,10 +9,7 @@ Summary:        A small open source library for using 3D graphics hardware to dr
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/1.10/%{name}-%{version}.tar.xz
-
-# fron redhat
-Patch0:		04_fix_crash_on_free.patch
+Source0:        http://www.clutter-project.org/sources/%{name}/1.12/%{name}-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
@@ -20,6 +17,7 @@ BuildRequires:	gobject-introspection-devel
 BuildRequires:	libXcomposite-devel
 BuildRequires:	libXcomposite-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	pango-devel
 BuildRequires:	pango-devel
+BuildRequires:	gdk-pixbuf2-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
 
 
 Vendor:		Project Vine
 Vendor:		Project Vine
@@ -58,10 +56,21 @@ This package contains documentation for cogl.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .crash
+
+for i in `grep -rl "<note>" ./`;
+do
+  sed -i 's/<note>//' $i
+done
+
+for i in `grep -rl "<\/note>" ./`;
+do
+  sed -i 's/<\/note>//' $i
+done
 
 
 %build
 %build
-%configure --enable-gtk-doc \
+
+%configure \
+	--enable-gtk-doc \
 	--disable-static \
 	--disable-static \
 	--enable-cairo=yes \
 	--enable-cairo=yes \
 	--enable-gdk-pixbuf=yes \
 	--enable-gdk-pixbuf=yes \
@@ -106,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/cogl-2.0-experimental
 %{_datadir}/gtk-doc/html/cogl-2.0-experimental
 
 
 %changelog
 %changelog
+* Fri Sep 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.0-1
+- new upstream release
+- remove Patch0 (04_fix_crash_on_free.patch)
+
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.4-1
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.4-1
 - new upstream release
 - new upstream release
 
 

+ 71 - 0
c/colord-gtk/colord-gtk-vl.spec

@@ -0,0 +1,71 @@
+Summary:	Additional GTK support code for colord
+Name:		colord-gtk
+Version:	0.1.23
+Release:	1%{?_dist_release}
+License:	GPLv3
+Group:		Applications/System
+URL:		http://gitorious.org/colord/colord-gtk
+Source0:	http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
+
+BuildRequires:	colord-devel >= 0.1.23
+BuildRequires:	gtk3-devel >= 3.0.0
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+%description
+Additional GTK support code for colord
+
+
+%package	devel
+Summary:        Development tools for %{name}
+Summary(ja):    %{name} の開発環境
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description	devel
+Header files and libraries for building a extension library for the
+%{name}.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+
+%find_lang %{name}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/libcolord-gtk.so.*
+%{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/colord-1
+%{_libdir}/libcolord-gtk.so
+%{_libdir}/pkgconfig/colord-gtk.pc
+%{_datadir}/gir-1.0/ColordGtk-1.0.gir
+
+
+%changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.23-1
+- initial build

+ 12 - 4
c/colord/colord-vl.spec

@@ -1,13 +1,14 @@
+%bcond_with firstbuild
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 Summary:   Color daemon
 Summary:   Color daemon
 Name:      colord
 Name:      colord
-Version:   0.1.21
+Version:   0.1.23
 Release:   1%{?_dist_release}
 Release:   1%{?_dist_release}
 Group:     System Environment/Daemons
 Group:     System Environment/Daemons
 License:   GPLv2+ and LGPLv2+
 License:   GPLv2+ and LGPLv2+
 URL:       http://gitorious.org/colord
 URL:       http://gitorious.org/colord
-Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
+Source0:   http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz
 
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: docbook-utils
@@ -16,10 +17,11 @@ BuildRequires: glib2-devel
 BuildRequires: intltool
 BuildRequires: intltool
 BuildRequires: lcms2-devel
 BuildRequires: lcms2-devel
 BuildRequires: libgudev1-devel
 BuildRequires: libgudev1-devel
-BuildRequires: libusb1-devel
+BuildRequires: libgusb-devel
 BuildRequires: polkit-devel
 BuildRequires: polkit-devel
 BuildRequires: sane-devel
 BuildRequires: sane-devel
 BuildRequires: sqlite3-devel
 BuildRequires: sqlite3-devel
+%{!?with_firstbuild:BuildRequires: colord-devel, gobject-introspection-devel}
 Requires: shared-color-profiles
 Requires: shared-color-profiles
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -112,6 +114,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/man/man1/*.1.gz
 %{_libdir}/libcolord.so.*
 %{_libdir}/libcolord.so.*
+%{!?with_firstbuild:%{_libdir}/girepository-1.0/Colord-1.0.typelib}
 %config %{_sysconfdir}/colord.conf
 %config %{_sysconfdir}/colord.conf
 /lib/udev/rules.d/*.rules
 /lib/udev/rules.d/*.rules
 %dir %{_datadir}/color/icc/colord
 %dir %{_datadir}/color/icc/colord
@@ -125,6 +128,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_includedir}/colord-1
 %{_includedir}/colord-1
 %{_libdir}/libcolord.so
 %{_libdir}/libcolord.so
 %{_libdir}/pkgconfig/colord.pc
 %{_libdir}/pkgconfig/colord.pc
+%{!?with_firstbuild:%{_datadir}/gir-1.0/Colord-1.0.gir}
 
 
 # compat32
 # compat32
 %if %{build_compat32}
 %if %{build_compat32}
@@ -135,10 +139,14 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %files -n compat32-%{name}-devel
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/libcolord.so
 %{_libdir}/libcolord.so
-%{_libdir}/pkgconfig/colord.pc
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp 0.1.23-1
+- new upstream release
+- change BuildRequires: libgusb-devel instead of libusb1-devel
+- add BuildRequires: gobject-introspection-devel
+
 * Tue Jun 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp 0.1.21-1
 * Tue Jun 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp 0.1.21-1
 - new upstream release
 - new upstream release
 
 

+ 21 - 32
c/control-center/control-center-vl.spec

@@ -1,8 +1,7 @@
-%define pango_version 1.30.0
-%define gtk3_version 3.4.0
-%define gnome_desktop3_version 3.4.0
-%define libgnomekbd_version 2.32.0
-%define gnome_vfs2_version 2.24.4
+%define pango_version 1.32.0
+%define gtk3_version 3.6.0
+%define gnome_desktop3_version 3.6.0
+%define libgnomekbd_version 3.6.0
 %define desktop_file_utils_version 0.3
 %define desktop_file_utils_version 0.3
 %define startup_notification_version 0.7
 %define startup_notification_version 0.7
 %define libxklavier_version 5.0
 %define libxklavier_version 5.0
@@ -19,13 +18,13 @@
 Summary: GNOME Control Center.
 Summary: GNOME Control Center.
 Summary(ja): GNOME コントロールセンター
 Summary(ja): GNOME コントロールセンター
 Name: control-center
 Name: control-center
-Version: 3.4.2
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL+
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 URL: http://www.gnome.org
 URL: http://www.gnome.org
 
 
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.4/gnome-control-center-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.6/gnome-control-center-%{version}.tar.xz
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -84,6 +83,8 @@ BuildRequires: colord-devel
 BuildRequires: NetworkManager-gtk-devel >= %{nm_version}
 BuildRequires: NetworkManager-gtk-devel >= %{nm_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libwacom-devel
 BuildRequires: libwacom-devel
+BuildRequires: libpwquality-devel
+BuildRequires: ibus-devel
 
 
 %description
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -119,8 +120,8 @@ GNOME コントロールセンターの開発用ファイルが含まれてい
 
 
 %build
 %build
 %configure --disable-static  \
 %configure --disable-static  \
-    --disable-scrollkeeper \
     --disable-update-mimedb \
     --disable-update-mimedb \
+    --enable-ibus
     CFLAGS="$RPM_OPT_FLAGS -Wno-error"
     CFLAGS="$RPM_OPT_FLAGS -Wno-error"
 
 
 # drop unneeded direct library deps with --as-needed
 # drop unneeded direct library deps with --as-needed
@@ -132,24 +133,7 @@ make %{?_smp_mflags}
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-for i in apps_gnome_settings_daemon_default_editor.schemas		\
-	    apps_gnome_settings_daemon_keybindings.schemas		\
-	    apps_gnome_settings_daemon_screensaver.schemas		\
-	    desktop_gnome_font_rendering.schemas ; do			\
-	    rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/$i ;	\
-done
-
-#desktop-file-install --vendor gnome --delete-original                   \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications				\
-#  --add-only-show-in GNOME                                              \
-#  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-
-# install visual effect icons
-# install -m644 visual-effects/*.svg $RPM_BUILD_ROOT%{_datadir}/gnome-control-center/pixmaps/
 
 
 # we do want this
 # we do want this
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
@@ -202,6 +186,11 @@ fi
 %files -f gnome-control-center-2.0.lang -f gnome-control-center-2.0-timezones.lang
 %files -f gnome-control-center-2.0.lang -f gnome-control-center-2.0-timezones.lang
 %defattr(-, root, root)
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc AUTHORS COPYING ChangeLog NEWS README
+%{_sysconfdir}/xdg/menus/gnomecc.menu
+%{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
+%{_bindir}/gnome-control-center
+%{_bindir}/gnome-sound-applet
+%{_libdir}/control-center-1/panels/*.so
 %dir %{_datadir}/gnome/wm-properties
 %dir %{_datadir}/gnome/wm-properties
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center
 %{_datadir}/applications/*
 %{_datadir}/applications/*
@@ -215,14 +204,10 @@ fi
 %{_datadir}/icons/*
 %{_datadir}/icons/*
 %{_datadir}/pixmaps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
+%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
+%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/sounds/*
 %{_datadir}/sounds/*
-# list all binaries explicitly, so we notice if one goes missing
-%{_bindir}/gnome-control-center
-%{_bindir}/gnome-sound-applet
-%{_libdir}/control-center-1/panels/*.so
-#{_libexecdir}/*
-%{_sysconfdir}/xdg/menus/gnomecc.menu
-%{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
+%{_mandir}/man1/gnome-control-center.1.gz
 
 
 %files devel
 %files devel
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -230,6 +215,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libpwquality-devel
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 7 - 5
d/dbus-glib/dbus-glib-vl.spec

@@ -1,15 +1,15 @@
 %define gettext_package dbus
 %define gettext_package dbus
 
 
-%define expat_version 2.0.1
-%define glib2_version 2.26.1
-%define dbus_version 1.4.1
+%define expat_version 2.1.0
+%define glib2_version 2.34.0
+%define dbus_version 1.6.4
 
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 Summary: GLib bindings for D-Bus
 Summary: GLib bindings for D-Bus
 Summary(ja): D-Bus の GLib バインディング
 Summary(ja): D-Bus の GLib バインディング
 Name: dbus-glib
 Name: dbus-glib
-Version: 0.98
+Version: 0.100
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://www.freedesktop.org/software/dbus/
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -143,10 +143,12 @@ rm -rf %{buildroot}
 %files -n compat32-%{name}-devel
 %files -n compat32-%{name}-devel
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
-%{_libdir}/pkgconfig/dbus-glib-1.pc
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.100-1
+- new upstream release
+
 * Sat Dec 31 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.98-1
 * Sat Dec 31 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.98-1
 - new upstream release
 - new upstream release
 
 

+ 6 - 16
d/dbus/dbus-vl.spec

@@ -2,7 +2,6 @@
 
 
 %define gettext_package dbus
 %define gettext_package dbus
 %define expat_version           2.0.1
 %define expat_version           2.0.1
-%define pyrex_version           0.9.9
 %define dbus_user_uid           81
 %define dbus_user_uid           81
 
 
 %define _localstatedir %{_var}
 %define _localstatedir %{_var}
@@ -10,7 +9,7 @@
 Summary: D-BUS message bus
 Summary: D-BUS message bus
 Summary(ja): D-BUS メッセージバスシステム
 Summary(ja): D-BUS メッセージバスシステム
 Name: dbus
 Name: dbus
-Version: 1.4.20
+Version: 1.6.8
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://www.freedesktop.org/software/dbus/
 URL: http://www.freedesktop.org/software/dbus/
 License: AFL/GPLv2
 License: AFL/GPLv2
@@ -20,13 +19,6 @@ Source0: %{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
 Source1: doxygen_to_devhelp.xsl
 
 
 # from fedora package
 # from fedora package
-Patch0: dbus-0.60-start-early.patch
-Patch1: dbus-1.0.1-generate-xml-docs.patch
-Patch6: dbus-1.2.1-increase-timeout.patch
-
-# Workaround for deny send_interface
-# http://bugs.freedesktop.org/show_bug.cgi?id=18961
-Patch10: dbus-1.2.12-workaround-deny-sendinterface.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): chkconfig >= 1.3.34
 Requires(post): chkconfig >= 1.3.34
@@ -35,7 +27,7 @@ Requires(pre): shadow-utils
 BuildRequires: libtool
 BuildRequires: libtool
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-devel
-BuildRequires: python-pyrex >= %{pyrex_version}
+BuildRequires: python-devel
 BuildRequires: doxygen
 BuildRequires: doxygen
 BuildRequires: xmlto
 BuildRequires: xmlto
 BuildRequires: libxslt
 BuildRequires: libxslt
@@ -115,11 +107,6 @@ Headers and static libraries for D-BUS.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-## %patch0 -p1 -b .start-early
-## %patch1 -p1 -b .generate-xml-docs
-%patch6 -p1 -b .increase-timeout
-
-%patch10 -p1 -b .workaround-dbus-sendinterface
 
 
 %build
 %build
 autoreconf -f -i
 autoreconf -f -i
@@ -253,10 +240,13 @@ fi
 %defattr(-,root,root)
 %defattr(-,root,root)
 /%{_lib}/lib*.so
 /%{_lib}/lib*.so
 %{_libdir}/dbus-1.0/include
 %{_libdir}/dbus-1.0/include
-%{_libdir}/pkgconfig/*
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sat Oct 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.8-1
+- new upstream release
+- remove old patches
+
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.20-1
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.20-1
 - new upstream release
 - new upstream release
 - add BuildRequires: audit-libs-devel, libcap-ng-devel
 - add BuildRequires: audit-libs-devel, libcap-ng-devel

+ 19 - 8
d/dconf/dconf-vl.spec

@@ -1,10 +1,10 @@
 # Basic Information
 # Basic Information
 Name:		dconf
 Name:		dconf
-Version:	0.12.1
+Version:	0.14.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	LGPL
 License:	LGPL
 Group:		System Environment/Base
 Group:		System Environment/Base
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.12/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.14/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
 Vendor:		Project Vine
 Vendor:		Project Vine
@@ -25,6 +25,8 @@ BuildRequires:	gtk3-devel
 BuildRequires:	libgee-devel
 BuildRequires:	libgee-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-devel
+BuildRequires:	libxslt-devel
+BuildRequires:	docbook-style-xsl
 
 
 %description
 %description
 dconf is a low-level configuration system. Its main purpose is to provide
 dconf is a low-level configuration system. Its main purpose is to provide
@@ -55,13 +57,14 @@ applications which will use %{name}.
 
 
 %build
 %build
 %configure
 %configure
-%{__make} %{?_smp_mflags} INTROSPECTION_SCANNER='/usr/bin/g-ir-scanner --identifier-prefix=DConf'
+#%{__make} %{?_smp_mflags} INTROSPECTION_SCANNER='/usr/bin/g-ir-scanner --identifier-prefix=DConf'
+%{__make} %{?_smp_mflags}
 
 
 %install
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 
-#%%find_lang %{name}
+%find_lang %{name}
 
 
 %clean
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -71,21 +74,22 @@ applications which will use %{name}.
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null || :
 update-desktop-database -q &> /dev/null || :
+gio-querymodules %{_libdir}/gio/modules
 
 
 %postun 
 %postun 
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 if [ $1 -eq 0 ] ; then
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     update-desktop-database -q &> /dev/null || :
     update-desktop-database -q &> /dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+    gio-querymodules %{_libdir}/gio/modules
 fi
 fi
 
 
 %posttrans 
 %posttrans 
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
-#%%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc COPYING NEWS
 %doc COPYING NEWS
 %{_bindir}/dconf
 %{_bindir}/dconf
@@ -93,12 +97,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/gio/modules/libdconfsettings.so
 %{_libdir}/gio/modules/libdconfsettings.so
 %{_libdir}/libdconf*.so.*
 %{_libdir}/libdconf*.so.*
 %{_libexecdir}/dconf-service
 %{_libexecdir}/dconf-service
-%{_sysconfdir}/bash_completion.d/dconf-bash-completion.sh
 %{_datadir}/applications/dconf-editor.desktop
 %{_datadir}/applications/dconf-editor.desktop
+%{_datadir}/bash-completion/completions/dconf
+%{_datadir}/dconf-editor/dconf-editor-menu.ui
 %{_datadir}/dbus-1/services/ca.desrt.dconf.service
 %{_datadir}/dbus-1/services/ca.desrt.dconf.service
 %{_datadir}/dconf-editor/dconf-editor.ui
 %{_datadir}/dconf-editor/dconf-editor.ui
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
+%{_mandir}/man1/*.gz
+%{_mandir}/man7/dconf.7.gz
 
 
 %files devel
 %files devel
 %defattr(-, root, root, -)
 %defattr(-, root, root, -)
@@ -111,6 +118,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/vala/vapi/dconf.vapi
 %{_datadir}/vala/vapi/dconf.vapi
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.14.0-1
+- new upstream release
+- add BuildRequires: libxslt-devel, docbook-style-xsl
+
 * Sun May 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.1-1
 * Sun May 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.1-1
 - new upstream release
 - new upstream release
 
 

+ 23 - 7
d/devhelp/devhelp-vl.spec

@@ -1,7 +1,7 @@
-Version:        3.4.1
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
-%define	gtk_required		3.4.1
+%define	gtk_required		3.6.0
 
 
 Summary:        API document browser
 Summary:        API document browser
 Summary(ja):    API ドキュメントブラウザ
 Summary(ja):    API ドキュメントブラウザ
@@ -9,7 +9,7 @@ Name:           devhelp
 License:        GPL
 License:        GPL
 Group:          Applications/Development
 Group:          Applications/Development
 Url:            http://live.gnome.org/devhelp
 Url:            http://live.gnome.org/devhelp
-Source:         http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.4/%{name}-%{version}.tar.xz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.6/%{name}-%{version}.tar.xz
 #Patch10:	%{name}-0.19.1-xulrunner19.patch
 #Patch10:	%{name}-0.19.1-xulrunner19.patch
 #Patch11:	%{name}-webkit.patch
 #Patch11:	%{name}-webkit.patch
 #Patch:		%{name}-r1265.patch
 #Patch:		%{name}-r1265.patch
@@ -72,22 +72,35 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 
 %post
 %post
 /sbin/ldconfig
 /sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+    %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 fi
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      	%{_sysconfdir}/gconf/schemas/devhelp.schemas >/dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      	%{_sysconfdir}/gconf/schemas/devhelp.schemas >/dev/null || :
+fi
   
   
 %postun
 %postun
 /sbin/ldconfig
 /sbin/ldconfig
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 fi
 
 
-%posttrans 
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
-
   
   
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -107,6 +120,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/pkgconfig/*
 %{_libdir}/pkgconfig/*
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun Apr 22 2012 TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 
 

+ 30 - 1
d/docbook-style-xsl/docbook-style-xsl-vl.spec

@@ -1,5 +1,5 @@
 Name: docbook-style-xsl
 Name: docbook-style-xsl
-Version: 1.76.1
+Version: 1.77.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: Applications/Text
 Group: Applications/Text
 
 
@@ -23,6 +23,9 @@ Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 # added fixes for passivetex extension and list-item-body(#161371)
 # added fixes for passivetex extension and list-item-body(#161371)
 Patch5: docbook-xsl-list-item-body.patch
 Patch5: docbook-xsl-list-item-body.patch
+#workaround missing mandir section problem (#727251)
+Patch6: docbook-xsl-mandir.patch
+
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildArch: noarch
@@ -59,6 +62,7 @@ popd
 %patch3 -p1 -b .newmethods
 %patch3 -p1 -b .newmethods
 %patch4 -p1 -b .nonconstant
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
 %patch5 -p1 -b .listitembody
+%patch6 -p1 -b .mandir
 
 
 cp %{SOURCE1} Makefile
 cp %{SOURCE1} Makefile
 
 
@@ -82,6 +86,7 @@ done
 
 
 DESTDIR=$RPM_BUILD_ROOT
 DESTDIR=$RPM_BUILD_ROOT
 make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
 make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
+cp -a VERSION.xsl $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}/VERSION.xsl
 ln -s xsl-stylesheets-%{version} \
 ln -s xsl-stylesheets-%{version} \
 	$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
 	$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
 
 
@@ -123,6 +128,30 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.77.1-1
+- new upstream release
+- add Patch6 (docbook-xsl-mandir.patch) from fedora
+- update Source1 (%{name}.Makefile)
+- update following patches from fedora
+  - Patch1 (docbook-xsl-pagesetup.patch)
+  - Patch2 (docbook-xsl-marginleft.patch)
+  - Patch3 (docbook-xsl-newmethods.patch)
+- update spec file based on fedora package
+  * Tue Jun  5 2012 Ondrej Vasik <ovasik@redhat.com> 1.77.1-2
+  - ship VERSION.xsl file (#829014)
+  * Tue Jun  5 2012 Ondrej Vasik <ovasik@redhat.com> 1.77.1-1
+  - new stable upstream release 1.77.1
+  - defuzz patches
+  * Tue Sep  6 2011 Ondrej Vasik <ovasik@redhat.com> 1.76.1-4
+  - revert previous change, workaround the mandir links issue
+    in buildroot (#727251)
+  * Mon Aug 29 2011 Ondrej Vasik <ovasik@redhat.com> 1.76.1-3
+  - make man.output.in.separate.dir "on" by default (#727251)
+  * Tue Nov 02 2010 Ondrej Vasik <ovasik@redhat.com> 1.76.1-1
+  - new upstream release 1.76.1
+  * Mon Sep 06 2010 Ondrej Vasik <ovasik@redhat.com> 1.76.0-1
+  - new upstream release 1.76.0
+
 * Fri Apr 22 2011 IWAI, Masaharu <iwai@alib.jp> 1.76.1-1
 * Fri Apr 22 2011 IWAI, Masaharu <iwai@alib.jp> 1.76.1-1
 - new upstream release
 - new upstream release
 - add Vendor and Distribution tags
 - add Vendor and Distribution tags

+ 5 - 2
e/ekiga/ekiga-vl.spec

@@ -1,8 +1,8 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Summary: A Gnome based SIP/H323 teleconferencing application
 Summary(ja): GNOME ベースの SIP/H323 遠隔会議アプリケーション
 Summary(ja): GNOME ベースの SIP/H323 遠隔会議アプリケーション
 Name: ekiga
 Name: ekiga
-Version: 3.3.2
-Release: 2%{?_dist_release}
+Version: 3.9.90
+Release: 1%{?_dist_release}
 URL: http://www.ekiga.org/
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.xz
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.xz
 License: GPL
 License: GPL
@@ -130,6 +130,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.9.90-1
+- new upstream release
+
 * Thu Apr 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.3.2-2
 * Thu Apr 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.3.2-2
 - rebuild with evolution-data-server-3.4.0
 - rebuild with evolution-data-server-3.4.0
 
 

+ 18 - 20
e/empathy/empathy-vl.spec

@@ -1,21 +1,21 @@
-%define major_ver 3.4
-%define minor_ver 2.3
+%define major_ver 3.6
+%define minor_ver 0
 %define rel       1
 %define rel       1
 
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 
 ## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
 ## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
 ## respectively.
 ## respectively.
-%global	gtk3_min_version	3.4.0
-%global	glib2_min_version	2.32.0
+%global	gtk3_min_version	3.6.0
+%global	glib2_min_version	2.34.0
 %global	tp_mc_min_version	5.12.0
 %global	tp_mc_min_version	5.12.0
 %global	tp_glib_min_version	0.18.0
 %global	tp_glib_min_version	0.18.0
 %global	tp_logger_min_version	0.2.10
 %global	tp_logger_min_version	0.2.10
 %global	aspell_version		0.50
 %global	aspell_version		0.50
 %global libcanberra_version	0.25
 %global libcanberra_version	0.25
-%global gnome_keyring_version	3.4
 %global libnotify_version	0.7.4
 %global libnotify_version	0.7.4
 %global folks_version		0.6.8
 %global folks_version		0.6.8
+%global libsecret_version	0.5
 
 
 Summary:	GNOME Instant Messaging Client
 Summary:	GNOME Instant Messaging Client
 Summary(ja):	GNOME インスタントメッセージクラアイント
 Summary(ja):	GNOME インスタントメッセージクラアイント
@@ -40,7 +40,6 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	evolution-data-server-devel
 BuildRequires:	evolution-data-server-devel
 BuildRequires:	gettext
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	glib2-devel >= %{glib2_min_version}
-BuildRequires:	gnome-doc-utils >= 0.17.3
 BuildRequires:	gnome-panel
 BuildRequires:	gnome-panel
 BuildRequires:	gtk3-devel >= %{gtk3_min_version}
 BuildRequires:	gtk3-devel >= %{gtk3_min_version}
 BuildRequires:	intltool
 BuildRequires:	intltool
@@ -52,11 +51,11 @@ BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:  farstream-devel
 BuildRequires:  farstream-devel
 BuildRequires:	telepathy-farstream-devel 
 BuildRequires:	telepathy-farstream-devel 
 BuildRequires:	libcanberra-gtk3-devel >= %{libcanberra_version}
 BuildRequires:	libcanberra-gtk3-devel >= %{libcanberra_version}
-BuildRequires:	libgnome-keyring-devel >= %{gnome_keyring_version}
 BuildRequires:	unique3-devel
 BuildRequires:	unique3-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	folks-devel >= %{folks_version}
 BuildRequires:	folks-devel >= %{folks_version}
 BuildRequires:	gcr-devel >= %{gnome_keyring_version}
 BuildRequires:	gcr-devel >= %{gnome_keyring_version}
+BuildRequires:	libsecret-devel >= %{libsecret_version}
 BuildRequires:	openssl-devel
 BuildRequires:	openssl-devel
 BuildRequires:	NetworkManager-glib-devel
 BuildRequires:	NetworkManager-glib-devel
 BuildRequires:	WebKit3-gtk-devel
 BuildRequires:	WebKit3-gtk-devel
@@ -69,7 +68,7 @@ BuildRequires:	gnome-online-accounts-devel
 BuildRequires:	libgudev1-devel
 BuildRequires:	libgudev1-devel
 BuildRequires:	libchamplain-gtk-devel
 BuildRequires:	libchamplain-gtk-devel
 BuildRequires:	gsettings-desktop-schemas-devel
 BuildRequires:	gsettings-desktop-schemas-devel
-BuildRequires:	itstool
+BuildRequires:	yelp-tools
 
 
 Requires:	telepathy-filesystem
 Requires:	telepathy-filesystem
 Requires:	telepathy-gabble
 Requires:	telepathy-gabble
@@ -83,11 +82,6 @@ BuildRequires:	telepathy-haze
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
 
 
 
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
-
-Requires(postun):	scrollkeeper
-
 ## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
 ## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
 Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
 Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
 Provides:	telepathy-haze-mission-control = 0.2.0-3
 Provides:	telepathy-haze-mission-control = 0.2.0-3
@@ -155,12 +149,10 @@ rm -rf %{buildroot}
 
 
 
 
 %post
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
 %postun
 %postun
-scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -182,15 +174,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libexecdir}/empathy-auth-client
 %{_libexecdir}/empathy-auth-client
 %{_libexecdir}/empathy-call
 %{_libexecdir}/empathy-call
 %{_libexecdir}/empathy-chat
 %{_libexecdir}/empathy-chat
-%{_datadir}/dbus-1/services/*
-%{_datadir}/empathy
-%{_datadir}/glib-2.0/schemas/*.xml
+%{_libdir}/%{name}/libempathy*.so
+%{_libdir}/mission-control-plugins.0/mcp-account-manager-goa.so
 %{_datadir}/GConf/gsettings/*
 %{_datadir}/GConf/gsettings/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
+%{_datadir}/adium/message-styles
+%{_datadir}/dbus-1/services/*
+%{_datadir}/%{name}
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/help/*/%{name}
 %{_datadir}/help/*/%{name}
-#{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_datadir}/icons/hicolor/*/apps/%{name}*
-#{_datadir}/mission-control/profiles/*.profile
 %{_datadir}/telepathy/clients/*.client
 %{_datadir}/telepathy/clients/*.client
 %{_mandir}/man1/empathy*.1*
 %{_mandir}/man1/empathy*.1*
 
 
@@ -200,6 +193,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libsecret-devel, yelp-tools
+- remove BuildRequires: libgnome-keyring-devel
+
 * Sun Jul 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.3-1
 * Sun Jul 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.3-1
 - new upstream release
 - new upstream release
 
 

+ 14 - 12
e/eog-plugins/eog-plugins-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 3.4.1
+%define pkg_version 3.6.0
 %define pkg_release 1%{?_dist_release}
 %define pkg_release 1%{?_dist_release}
 
 
 Summary: Plugins for eog
 Summary: Plugins for eog
@@ -6,29 +6,24 @@ Summary(ja): eog用のプラグイン
 Name: eog-plugins
 Name: eog-plugins
 Version: %{pkg_version}
 Version: %{pkg_version}
 Release: %{pkg_release}
 Release: %{pkg_release}
-Source0: http://download.gnome.org/sources/eog-plugins/3.4/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/eog-plugins/3.6/%{name}-%{version}.tar.xz
 Source1: README.vine
 Source1: README.vine
 License: GPLv2+
 License: GPLv2+
 Group: Applications/Graphics
 Group: Applications/Graphics
 URL: http://live.gnome.org/EyeOfGnome/Plugins
 URL: http://live.gnome.org/EyeOfGnome/Plugins
 
 
-Requires: gtk3
-Requires: eog
-Requires: python
-Requires: gnome-python
-Requires: pygtk2
-Requires: libexif
-Requires: libchamplain, libchamplain-gtk
 BuildRequires: gtk3-devel
 BuildRequires: gtk3-devel
 BuildRequires: eog-devel
 BuildRequires: eog-devel
-BuildRequires: pygobject-devel
-BuildRequires: gnome-python-devel
-BuildRequires: pygtk2-devel
 BuildRequires: libexif-devel
 BuildRequires: libexif-devel
 BuildRequires: libchamplain-devel, libchamplain-gtk-devel
 BuildRequires: libchamplain-devel, libchamplain-gtk-devel
 BuildRequires: libpeas-devel
 BuildRequires: libpeas-devel
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: libgdata-devel
 BuildRequires: libgdata-devel
 BuildRequires: postr
 BuildRequires: postr
+
+Requires: eog
+Requires(postun,posttrans): glib2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -77,10 +72,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %doc COPYING ChangeLog NEWS README README.vine
 %doc COPYING ChangeLog NEWS README README.vine
 %{_libdir}/*
 %{_libdir}/*
 %{_datadir}/eog/plugins/exif-display/*.ui
 %{_datadir}/eog/plugins/exif-display/*.ui
+%{_datadir}/eog/plugins/pythonconsole/config.ui
 %{_datadir}/eog/plugins/postasa
 %{_datadir}/eog/plugins/postasa
 %{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.pythonconsole.gschema.xml
+
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: gsettings-desktop-schemas-devel
+
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 - remove Patch0
 - remove Patch0

+ 13 - 16
e/eog/eog-vl.spec

@@ -1,7 +1,6 @@
-%define glib2_version 2.32.1
-%define pango_version 1.30.0
-%define gtk3_version 3.4.1
-%define gconf2_version 2.32.2
+%define glib2_version 2.34.0
+%define pango_version 1.32.0
+%define gtk3_version 3.6.0
 %define gnome_desktop3_version 3.4.0
 %define gnome_desktop3_version 3.4.0
 %define gnome_icon_theme_version 3.4.0
 %define gnome_icon_theme_version 3.4.0
 %define desktop_file_utils_version 0.16
 %define desktop_file_utils_version 0.16
@@ -9,21 +8,18 @@
 Summary: Eye of GNOME image viewer
 Summary: Eye of GNOME image viewer
 Summary(ja): Eye of GNOME 画像ビューワ
 Summary(ja): Eye of GNOME 画像ビューワ
 Name:    eog
 Name:    eog
-Version: 3.4.3
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://projects.gnome.org/eog/
 URL: http://projects.gnome.org/eog/
 Group: Applications/Graphics
 Group: Applications/Graphics
 License: GPL 
 License: GPL 
 
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires(post,postun): scrollkeeper
-Requires(post,pre,preun): GConf2
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-devel
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -33,7 +29,8 @@ BuildRequires: libexif-devel
 BuildRequires: libXt-devel
 BuildRequires: libXt-devel
 BuildRequires: libffi-devel
 BuildRequires: libffi-devel
 BuildRequires: lcms2-devel
 BuildRequires: lcms2-devel
-BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: exempi-devel
+BuildRequires: yelp-tools
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: librsvg2-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libpeas-devel
 BuildRequires: libpeas-devel
@@ -58,7 +55,6 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:      pkgconfig
 Requires:      pkgconfig
 Requires:      gtk3-devel
 Requires:      gtk3-devel
-Requires:      GConf2-devel
 
 
 %description devel
 %description devel
 Header files and libraries for building a extension library for the eog.
 Header files and libraries for building a extension library for the eog.
@@ -68,18 +64,15 @@ Header files and libraries for building a extension library for the eog.
 %setup -q
 %setup -q
 
 
 %build
 %build
-%configure --disable-schemas-install --disable-scrollkeeper
+%configure --disable-static
 %__make %{?_smp_mflags}
 %__make %{?_smp_mflags}
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugings/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugings/*.la
-rm -fr $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/eog/plugins
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/eog/plugins
 
 
@@ -120,8 +113,8 @@ fi
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/eog
 %{_datadir}/eog
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/gnome
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/help/*/*/*
 
 
 %files devel
 %files devel
 %{_includedir}/eog-3.0
 %{_includedir}/eog-3.0
@@ -129,6 +122,10 @@ fi
 %{_datadir}/gtk-doc/html/eog
 %{_datadir}/gtk-doc/html/eog
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: exempi-devel, yelp-tools
+
 * Tue Jul 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 * Tue Jul 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 - new upstream release
 
 

+ 12 - 9
e/epiphany/epiphany-vl.spec

@@ -10,13 +10,13 @@ ExclusiveArch: %ix86 ppc x86_64 alpha
 Summary: GNOME web browser based on Gecko/WebKit
 Summary: GNOME web browser based on Gecko/WebKit
 Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
 Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
 Name: epiphany
 Name: epiphany
-Version: 3.4.3
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPL
 License: GPL
 Group: Applications/Internet
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
 URL: http://www.gnome.org/projects/epiphany/
 
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.6/%{name}-%{version}.tar.xz
 Patch1: epiphany-2.26.2-gecko191.patch
 Patch1: epiphany-2.26.2-gecko191.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -25,7 +25,7 @@ Requires: gnome-icon-theme >= 2.30.0
 %if %{with_gecko}
 %if %{with_gecko}
 Requires: gecko-libs
 Requires: gecko-libs
 %endif
 %endif
-Requires(post,postun): scrollkeeper, shared-mime-info
+Requires(post,postun): shared-mime-info
 
 
 %if %{with_gecko}
 %if %{with_gecko}
 BuildRequires: gecko-devel-unstable >= %{gecko_version}
 BuildRequires: gecko-devel-unstable >= %{gecko_version}
@@ -39,9 +39,10 @@ BuildRequires: libxml2-devel >= 2.6.12
 BuildRequires: libxslt-devel >= 1.1.7
 BuildRequires: libxslt-devel >= 1.1.7
 BuildRequires: libnotify-devel >= 0.4.0
 BuildRequires: libnotify-devel >= 0.4.0
 BuildRequires: libsoup-devel >= 2.37.1
 BuildRequires: libsoup-devel >= 2.37.1
-BuildRequires: gnome-desktop-devel >= 2.30.0
+BuildRequires: gnome-desktop3-devel >= 2.91.2
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
 BuildRequires: libgnome-keyring-devel
 BuildRequires: libgnome-keyring-devel
+BuildRequires: gcr-devel >= 3.5.5
 BuildRequires: gobject-introspection-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: sqlite3-devel
 BuildRequires: sqlite3-devel
@@ -49,7 +50,7 @@ BuildRequires: seed-devel
 BuildRequires: nss-devel
 BuildRequires: nss-devel
 BuildRequires: avahi-gobject-devel
 BuildRequires: avahi-gobject-devel
 BuildRequires: iso-codes
 BuildRequires: iso-codes
-BuildRequires: gnome-doc-utils
+BuildRequires: yelp-tools
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -92,7 +93,6 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 %endif
 %endif
   --enable-zeroconf \
   --enable-zeroconf \
   --enable-network-manager \
   --enable-network-manager \
-  --disable-scrollkeeper \
   --without-ca-file \
   --without-ca-file \
   --enable-introspection=yes \
   --enable-introspection=yes \
   --enable-seed
   --enable-seed
@@ -107,20 +107,17 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 %find_lang %{name} --with-gnome
 %find_lang %{name} --with-gnome
 
 
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/*/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/*/plugins/*.la
 
 
 
 
 %postun
 %postun
 if [ $1 -eq 0 ] ; then
 if [ $1 -eq 0 ] ; then
     update-desktop-database %{_datadir}/applications >& /dev/null ||:
     update-desktop-database %{_datadir}/applications >& /dev/null ||:
-    scrollkeeper-update >& /dev/null ||:
     glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
     glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 fi
 
 
 %posttrans
 %posttrans
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
-scrollkeeper-update >& /dev/null ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
@@ -154,6 +151,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+- add BuildRequires: gcr-devel
+
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 - new upstream release
 
 

+ 13 - 45
e/evince/evince-vl.spec

@@ -1,9 +1,9 @@
 Summary:	Document viewer
 Summary:	Document viewer
 Summary(ja): 	文書ビューワー
 Summary(ja): 	文書ビューワー
 Name:		evince
 Name:		evince
-Version:	3.4.0
+Version:	3.6.0
 Release: 	1%{?_dist_release}
 Release: 	1%{?_dist_release}
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evince/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/%{name}-%{version}.tar.xz
 
 
 Patch0:		evince-3.4.0-desktop.patch
 Patch0:		evince-3.4.0-desktop.patch
 
 
@@ -14,7 +14,6 @@ URL:		http://www.gnome.org/projects/evince/
 BuildRequires:	glib2-devel >= 2.28.6
 BuildRequires:	glib2-devel >= 2.28.6
 BuildRequires:	gtk3-devel >= 3.0.0
 BuildRequires:	gtk3-devel >= 3.0.0
 BuildRequires:  libgnome-keyring-devel >= 2.32.0
 BuildRequires:  libgnome-keyring-devel >= 2.32.0
-BuildRequires:	gnome-doc-utils >= 0.20.0
 BuildRequires:	poppler-devel >= 0.14.0
 BuildRequires:	poppler-devel >= 0.14.0
 BuildRequires:  dbus-glib-devel >= 0.33
 BuildRequires:  dbus-glib-devel >= 0.33
 BuildRequires:	desktop-file-utils
 BuildRequires:	desktop-file-utils
@@ -24,22 +23,21 @@ BuildRequires:  libspectre-devel >= 0.2.1
 BuildRequires:  libkpathsea-devel
 BuildRequires:  libkpathsea-devel
 BuildRequires:  nautilus-devel
 BuildRequires:  nautilus-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libSM-devel
-BuildRequires:  GConf2-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  libgxps-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gsettings-desktop-schemas-devel
 BuildRequires:	gsettings-desktop-schemas-devel
+BuildRequires:	yelp-tools
 
 
-Requires(post):   desktop-file-utils scrollkeeper GConf2
-Requires(pre):    GConf2
-Requires(preun):  GConf2
-Requires(postun): desktop-file-utils scrollkeeper
+Requires(posttrans):   desktop-file-utils glib2
+Requires(postun): desktop-file-utils glib2
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
-Packager:	daisuke, kazutaka, inagaki
+Packager:	daisuke, kazutaka, inagaki, Takemikaduchi
 
 
 %description
 %description
 Evince is a document viewer capable of displaying multiple and single
 Evince is a document viewer capable of displaying multiple and single
@@ -95,7 +93,6 @@ This package contains a backend to let evince display dvi files.
 
 
 %build
 %build
 %configure \
 %configure \
-  --disable-scrollkeeper --disable-schemas-install \
   --disable-djvu \
   --disable-djvu \
   --enable-introspection \
   --enable-introspection \
   --enable-dvi \
   --enable-dvi \
@@ -123,53 +120,19 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 %post
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="evince-thumbnailer.schemas \
-         evince-thumbnailer-comics.schemas \
-         evince-thumbnailer-dvi.schemas \
-         evince-thumbnailer-comics.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/gconf/schemas/$S; done \
-  | xargs gconftool-2 --makefile-install-rule >& /dev/null || :
 
 
 %posttrans
 %posttrans
-scrollkeeper-update > /dev/null 2>&1 || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database %{_datadir}/applications >& /dev/null || :
 update-desktop-database %{_datadir}/applications >& /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="evince-thumbnailer.schemas \
-             evince-thumbnailer-comics.schemas \
-             evince-thumbnailer-dvi.schemas \
-             evince-thumbnailer-comics.schemas"
-    for S in $SCHEMAS; do
-      echo %{_sysconfdir}/gconf/schemas/$S; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="evince-thumbnailer.schemas \
-             evince-thumbnailer-comics.schemas \
-             evince-thumbnailer-dvi.schemas \
-             evince-thumbnailer-comics.schemas"
-    for S in $SCHEMAS; do
-      echo %{_sysconfdir}/gconf/schemas/$S; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-fi
-
 %postun
 %postun
 if [ $1 -eq 0 ] ; then
 if [ $1 -eq 0 ] ; then
-    scrollkeeper-update > /dev/null 2>&1 || :
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     update-desktop-database %{_datadir}/applications >& /dev/null ||:
     update-desktop-database %{_datadir}/applications >& /dev/null ||:
+    glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 fi
 fi
-glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -208,6 +171,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libgxps-devel
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 - add BuildRequires: gsettings-desktop-schemas-devel
 - add BuildRequires: gsettings-desktop-schemas-devel

+ 25 - 21
e/evolution-data-server/evolution-data-server-vl.spec

@@ -4,8 +4,8 @@
 %define krb5_support 1
 %define krb5_support 1
 %define nntp_support 1
 %define nntp_support 1
 
 
-%define glib2_version 2.32.0
-%define gtk3_version 3.4.0
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
 %define gtk_doc_version 1.18
 %define gtk_doc_version 1.18
 %define intltool_version 0.35.5
 %define intltool_version 0.35.5
 %define orbit2_version 2.14.19
 %define orbit2_version 2.14.19
@@ -14,7 +14,7 @@
 %define libical_version 0.44
 %define libical_version 0.44
 %define libgdata_version 0.10.1
 %define libgdata_version 0.10.1
 
 
-%define eds_base_version 3.4
+%define eds_base_version 3.6
 %define eds_api_version 1.2
 %define eds_api_version 1.2
 
 
 %define use_gnome_keyring 1
 %define use_gnome_keyring 1
@@ -23,18 +23,19 @@
 %define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
 %define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
 %define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
 %define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
 %define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
 %define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
+%define registry_modules_dir %{_libdir}/evolution-data-server/registry-modules
 
 
 ### Abstract ###
 ### Abstract ###
 
 
 Summary: Backend data server for evolution
 Summary: Backend data server for evolution
 Summary(ja): Evolution バックエンドデータサーバ
 Summary(ja): Evolution バックエンドデータサーバ
 Name: evolution-data-server
 Name: evolution-data-server
-Version: 3.4.4
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: LGPL
 License: LGPL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: http://www.gnome.org/projects/evolution/
 URL: http://www.gnome.org/projects/evolution/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.6/%{name}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 ### Patches ###
 ### Patches ###
@@ -44,14 +45,12 @@ Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
 
 ### Dependencies ###
 ### Dependencies ###
 
 
-Requires: GConf2
-Requires: ORBit2 >= %{orbit2_version}
+#Requires: ORBit2 >= %{orbit2_version}
 Requires: libsoup >= %{soup_version}
 Requires: libsoup >= %{soup_version}
 
 
 ### Build Dependencies ###
 ### Build Dependencies ###
 
 
-BuildRequires: GConf2-devel
-BuildRequires: ORBit2-devel >= %{orbit2_version}
+#BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: bison
 BuildRequires: bison
 BuildRequires: db4-devel
 BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: flex
@@ -111,15 +110,9 @@ is now used by other packages.
 Summary: Development files for building against evolution-data-server
 Summary: Development files for building against evolution-data-server
 Group: Development/Libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
-Requires: libgnome-devel
-Requires: libgweather-devel
-Requires: libsoup-devel
-Requires: libical-devel >= %{libical_version}
+Requires: pkgconfig
 Requires: sqlite3-devel
 Requires: sqlite3-devel
-%if %{use_nss}
-Requires: nspr-devel
-Requires: nss-devel
-%endif
+Requires: libgnome-keyring-devel
 
 
 %description devel
 %description devel
 Development files needed for building things which link against 
 Development files needed for building things which link against 
@@ -230,10 +223,7 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 
 
 # remove libtool archives for importers and the like
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/addressbook-backends/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/calendar-backends/*.a
+find $RPM_BUILD_ROOT/%{_libdir} -name '*.a' -exec rm {} \;
 
 
 # give the libraries some executable bits 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -262,19 +252,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
 %{_libexecdir}/evolution-addressbook-factory
 %{_libexecdir}/evolution-addressbook-factory
 %{_libexecdir}/evolution-calendar-factory
 %{_libexecdir}/evolution-calendar-factory
+%{_libexecdir}/evolution-source-registry
 %{_libexecdir}/camel-index-control-%{eds_api_version}
 %{_libexecdir}/camel-index-control-%{eds_api_version}
 %{_libexecdir}/camel-lock-helper-%{eds_api_version}
 %{_libexecdir}/camel-lock-helper-%{eds_api_version}
+%{_datadir}/GConf/gsettings/evolution-data-server.convert
 %{_datadir}/GConf/gsettings/libedataserver.convert
 %{_datadir}/GConf/gsettings/libedataserver.convert
 %{_datadir}/evolution-data-server-%{eds_base_version}
 %{_datadir}/evolution-data-server-%{eds_base_version}
 %{_datadir}/dbus-1/services/*
 %{_datadir}/dbus-1/services/*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.addressbook.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml
 %{_datadir}/pixmaps/evolution-data-server
 %{_datadir}/pixmaps/evolution-data-server
 
 
 %dir %{_libdir}/evolution-data-server
 %dir %{_libdir}/evolution-data-server
 %dir %{camel_provider_dir}
 %dir %{camel_provider_dir}
 %dir %{ebook_backends_dir}
 %dir %{ebook_backends_dir}
 %dir %{ecal_backends_dir}
 %dir %{ecal_backends_dir}
+%dir %{registry_modules_dir}
 
 
 # Camel providers:
 # Camel providers:
 %{camel_provider_dir}/libcamelimap.so
 %{camel_provider_dir}/libcamelimap.so
@@ -311,6 +307,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{ecal_backends_dir}/libecalbackendhttp.so
 %{ecal_backends_dir}/libecalbackendhttp.so
 %{ecal_backends_dir}/libecalbackendweather.so
 %{ecal_backends_dir}/libecalbackendweather.so
 
 
+%{registry_modules_dir}/module-cache-reaper.so
+%{registry_modules_dir}/module-google-backend.so
+%{registry_modules_dir}/module-online-accounts.so
+%{registry_modules_dir}/module-yahoo-backend.so
+
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
 %{_includedir}/evolution-data-server-%{eds_base_version}
@@ -330,6 +331,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/gtk-doc/html/libedataserverui
 %{_datadir}/gtk-doc/html/libedataserverui
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 * Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 - new upstream release
 - new upstream release
 
 

+ 23 - 134
e/evolution/evolution-vl.spec

@@ -11,11 +11,12 @@
 %define scrollkeeper_version 0.1.4
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.32.0
 %define soup_version 2.32.0
 %define unique_version 2.90.4
 %define unique_version 2.90.4
-%define gstreamer_version 0.10.30
+%define gstreamer1_version 0.11.0
 %define gnome_desktop3_version 2.91.3
 %define gnome_desktop3_version 2.91.3
-%define libgdata_version 0.4.0
+%define libgdata_version 0.10
+%define libgweather_version 3.5.0
 
 
-%define evo_major 3.4
+%define evo_major 3.6
 
 
 %define ldap_support 1
 %define ldap_support 1
 %define libnotify_support 1
 %define libnotify_support 1
@@ -32,12 +33,12 @@
 ### Abstract ###
 ### Abstract ###
 
 
 Name: evolution
 Name: evolution
-Version: 3.4.4
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2 and GFDL+
 License: GPLv2 and GFDL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/projects/evolution/
 URL: http://www.gnome.org/projects/evolution/
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/3.4/%{name}-%{version}.tar.xz
+Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/3.6/%{name}-%{version}.tar.xz
 
 
 Summary: GNOME's next-generation groupware suite
 Summary: GNOME's next-generation groupware suite
 Summary(ja): GNOME 次世代グループウェアスイート
 Summary(ja): GNOME 次世代グループウェアスイート
@@ -78,29 +79,19 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
 
 
 ### Build Dependencies ###
 ### Build Dependencies ###
 
 
-BuildRequires: GConf2-devel
-BuildRequires: atk-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: desktop-file-utils
+BuildRequires: gtk3-devel
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
-BuildRequires: gnutls-devel
+BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
 BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
-BuildRequires: libsoup-devel >= %{soup_version}
-BuildRequires: libtool >= 1.5
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: unique3-devel >= %{unique_version}
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libcanberra-gtk3-devel
-BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
-BuildRequires: gstreamer-devel >= %{gstreamer_version}
-BuildRequires: gtkimageview-devel
+BuildRequires: WebKit3-gtk-devel
+BuildRequires: gstreamer1-devel >= %{gstreamer1_version}
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
 BuildRequires: libgdata-devel >= %{libgdata_version}
 BuildRequires: libgdata-devel >= %{libgdata_version}
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: gnome-online-accounts-devel
+BuildRequires: itstool
 
 
 BuildRequires: bison
 BuildRequires: bison
 BuildRequires: gettext
 BuildRequires: gettext
@@ -293,10 +284,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export tagname=CC
-make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 
 # remove libtool archives for importers and the like
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
@@ -323,59 +311,6 @@ grep -v "%{_datadir}/locale" evolution-%{evo_major}.lang > help.lang
 scrollkeeper-update -q
 scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps-evolution-mail-notification.schemas \
-         apps-evolution-mail-prompts-checkdefault.schemas \
-	 apps_evolution_addressbook.schemas \
-	 apps-evolution-attachment-reminder.schemas \
-	 apps_evolution_calendar.schemas \
-	 apps_evolution_shell.schemas \
-	 evolution-mail.schemas \
-	 apps-evolution-template-placeholders.schemas \
-	 apps_evolution_email_custom_header.schemas \
-	 apps_evolution_eplugin_face.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
-done
-
-%post bogofilter
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null
-
-%post spamassassin
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null
-
-%preun
-if [ "$1" -eq 0 ] ; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps-evolution-mail-notification.schemas \
-	         apps-evolution-mail-prompts-checkdefault.schemas \
-		 apps_evolution_addressbook.schemas \
-		 apps-evolution-attachment-reminder.schemas \
-		 apps_evolution_calendar.schemas \
-		 apps_evolution_shell.schemas \
-		 evolution-mail.schemas \
-		 apps-evolution-template-placeholders.schemas \
-		 apps_evolution_email_custom_header.schemas \
-		 apps_evolution_eplugin_face.schemas"
-	for S in $SCHEMAS; do
-	  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$S > /dev/null
-	done
-fi
-
-%preun bogofilter
-if [ "$1" -eq 0 ] ; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
-fi
-
-%preun spamassassin
-if [ "$1" -eq 0 ] ; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
-fi
-
 
 
 %postun
 %postun
 /sbin/ldconfig
 /sbin/ldconfig
@@ -415,17 +350,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
-# schemas:
-%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
-%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas
-%{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
@@ -440,17 +364,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
 
 
 # The main executable
 # The main executable
 %{_bindir}/evolution
 %{_bindir}/evolution
 
 
-%{_bindir}/evolution-settings
-
 # Desktop files:
 # Desktop files:
 %{_datadir}/applications/evolution.desktop
 %{_datadir}/applications/evolution.desktop
-%{_datadir}/applications/evolution-settings.desktop
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 
 # Icons:
 # Icons:
@@ -471,8 +393,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_major}
 %dir %{_libdir}/evolution/%{evo_major}
 %{_libdir}/evolution/%{evo_major}/modules/*
 %{_libdir}/evolution/%{evo_major}/modules/*
-%exclude %{_libdir}/evolution/%{evo_major}/modules/libevolution-module-bogofilter.so
-%exclude %{_libdir}/evolution/%{evo_major}/modules/libevolution-module-spamassassin.so
+%exclude %{_libdir}/evolution/%{evo_major}/modules/module-bogofilter.so
+%exclude %{_libdir}/evolution/%{evo_major}/modules/module-spamassassin.so
 
 
 # Various libexec programs:
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution
@@ -491,44 +413,18 @@ rm -rf $RPM_BUILD_ROOT
 # are built as part of specific plugins but which are currently packaged using 
 # are built as part of specific plugins but which are currently packaged using 
 # globs above; the purpose of the separation below is to be more explicit about
 # globs above; the purpose of the separation below is to be more explicit about
 # which plugins we ship)
 # which plugins we ship)
-%{evo_plugin_dir}/org-gnome-addressbook-file.eplug
-%{evo_plugin_dir}/liborg-gnome-addressbook-file.so
 
 
 %{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
 %{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
 %{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
 
 
-%{evo_plugin_dir}/org-gnome-audio-inline.eplug
-%{evo_plugin_dir}/liborg-gnome-audio-inline.so
-
-%{evo_plugin_dir}/org-gnome-backup-restore.eplug
-%{evo_plugin_dir}/liborg-gnome-backup-restore.so
-
-%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
-
-%{evo_plugin_dir}/org-gnome-calendar-file.eplug
-%{evo_plugin_dir}/liborg-gnome-calendar-file.so
-
-%{evo_plugin_dir}/org-gnome-calendar-http.eplug
-%{evo_plugin_dir}/liborg-gnome-calendar-http.so
-
-%{evo_plugin_dir}/org-gnome-calendar-weather.eplug
-%{evo_plugin_dir}/liborg-gnome-calendar-weather.so
-
-##%{evo_plugin_dir}/org-gnome-default-mailer.eplug
-##%{evo_plugin_dir}/liborg-gnome-default-mailer.so
-
-%{evo_plugin_dir}/org-gnome-default-source.eplug
-%{evo_plugin_dir}/liborg-gnome-default-source.so
-
 %{evo_plugin_dir}/org-gnome-email-custom-header.eplug
 %{evo_plugin_dir}/org-gnome-email-custom-header.eplug
 %{evo_plugin_dir}/liborg-gnome-email-custom-header.so
 %{evo_plugin_dir}/liborg-gnome-email-custom-header.so
 
 
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
 
 
-%{evo_plugin_dir}/org-gnome-evolution-google.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-google.so
+%{evo_plugin_dir}/org-gnome-external-editor.eplug
+%{evo_plugin_dir}/liborg-gnome-external-editor.so
 
 
 ##%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 ##%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 ##%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 ##%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
@@ -540,9 +436,6 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/org-gnome-image-inline.eplug
 #%{evo_plugin_dir}/org-gnome-image-inline.eplug
 #%{evo_plugin_dir}/liborg-gnome-image-inline.so
 #%{evo_plugin_dir}/liborg-gnome-image-inline.so
 
 
-%{evo_plugin_dir}/org-gnome-imap-features.eplug
-%{evo_plugin_dir}/liborg-gnome-imap-features.so
-
 %{evo_plugin_dir}/org-gnome-itip-formatter.eplug
 %{evo_plugin_dir}/org-gnome-itip-formatter.eplug
 %{evo_plugin_dir}/liborg-gnome-itip-formatter.so
 %{evo_plugin_dir}/liborg-gnome-itip-formatter.so
 
 
@@ -576,12 +469,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
 %{evo_plugin_dir}/liborg-gnome-templates.so
 
 
-%{evo_plugin_dir}/org-gnome-vcard-inline.eplug
-%{evo_plugin_dir}/liborg-gnome-vcard-inline.so
-
-%{evo_plugin_dir}/org-gnome-evolution-webdav.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-webdav.so
-
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 
 
@@ -601,17 +488,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files bogofilter
 %files bogofilter
 %defattr(-, root, root)
 %defattr(-, root, root)
-%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-bogofilter.so
-%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas
+%{_libdir}/evolution/%{evo_major}/modules/module-bogofilter.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 
 
 %files spamassassin
 %files spamassassin
 %defattr(-, root, root)
 %defattr(-, root, root)
-%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-spamassassin.so
-%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas
+%{_libdir}/evolution/%{evo_major}/modules/module-spamassassin.so
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libgweather-devel, WebKit3-gtk-devel, itstool
+
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 * Sat Aug 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 - new upstream release
 - new upstream release
 
 

+ 8 - 3
e/exempi/exempi-vl.spec

@@ -1,14 +1,15 @@
 Summary:	Library for easy parsing of XMP metadata
 Summary:	Library for easy parsing of XMP metadata
 Summary:	XMP メタデータを簡単にパースするライブラリ
 Summary:	XMP メタデータを簡単にパースするライブラリ
 Name:		exempi
 Name:		exempi
-Version:	2.1.1
+Version:	2.2.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	BSD
 License:	BSD
 Group:		System Environment/Libraries
 Group:		System Environment/Libraries
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
-Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.gz
+Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libboost-devel expat-devel zlib-devel pkgconfig
+BuildRequires:	expat-devel zlib-devel pkgconfig
+BuildRequires:	libboost-devel
 BuildRequires:	libboost-test
 BuildRequires:	libboost-test
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -60,6 +61,7 @@ rm -rf %{buildroot}
 %files
 %files
 %defattr(-, root, root, -)
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING README
 %doc AUTHORS ChangeLog COPYING README
+%{_bindir}/exempi
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 
 
 %files devel
 %files devel
@@ -69,6 +71,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.0-1
+- new upstream release
+
 * Mon Jun 13 2011 IWAI, Masaharu <iwai@alib.jp> 2.1.1-1
 * Mon Jun 13 2011 IWAI, Masaharu <iwai@alib.jp> 2.1.1-1
 - initial build for Vine Linux
 - initial build for Vine Linux
 
 

+ 8 - 6
e/expat/expat-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define name   expat
 %define name   expat
-%define version 2.0.1
-%define release 8%{?_dist_release}
+%define version 2.1.0
+%define release 1%{?_dist_release}
 
 
 Summary:	Expat is an XML 1.0 parser written in C
 Summary:	Expat is an XML 1.0 parser written in C
 Summary(ja):	C で書かれた XML 1.0 パーサ
 Summary(ja):	C で書かれた XML 1.0 パーサ
@@ -12,8 +12,6 @@ License:	MIT/X
 Group:		Applications/Text
 Group:		Applications/Text
 URL:            http://www.libexpat.org/
 URL:            http://www.libexpat.org/
 Source:         http://download.sourceforge.net/expat/%{name}-%{version}.tar.gz
 Source:         http://download.sourceforge.net/expat/%{name}-%{version}.tar.gz
-Patch100:	expat-2.0.1-CVE-2009-3560-revised.patch
-Patch110:	expat-2.0.1_CVE-2009-3720.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	lib%{name} = %{version}-%{release}
 Requires:	lib%{name} = %{version}-%{release}
@@ -48,6 +46,7 @@ Summary:	Development environment for the expat XML parser
 Summary(ja):	expat XML パーサ用開発環境
 Summary(ja):	expat XML パーサ用開発環境
 Group:		Development/Libraries
 Group:		Development/Libraries
 Requires:	lib%{name} = %{version}-%{release}
 Requires:	lib%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
 
 %description devel
 %description devel
 Development environment for the expat XML parser
 Development environment for the expat XML parser
@@ -84,8 +83,6 @@ expat XML パーサ用開発環境です.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch100 -p1 -b .CVE-2009-3560
-%patch110 -p1 -b .CVE-2009-3720
 
 
 %build
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -129,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/libexpat.a
 %{_libdir}/libexpat.a
 %{_libdir}/libexpat.so
 %{_libdir}/libexpat.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 ## to build compat32 for x86_64 architecture support
 ## to build compat32 for x86_64 architecture support
 %if %{build_compat32}
 %if %{build_compat32}
@@ -143,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.0-1
+- update to 2.1.0
+- remove old patches
+
 * Tue Apr 26 2011 IWAI, Masaharu <iwai@alib.jp> 2.0.1-8
 * Tue Apr 26 2011 IWAI, Masaharu <iwai@alib.jp> 2.0.1-8
 - update patch100 to regrassion fix (same as debian bug #561658)
 - update patch100 to regrassion fix (same as debian bug #561658)
 - add Vendor and Distribution tags
 - add Vendor and Distribution tags

+ 21 - 16
f/farstream/farstream-vl.spec

@@ -1,7 +1,7 @@
 Summary:        A collection of GStreamer modules and libraries for videoconferencing
 Summary:        A collection of GStreamer modules and libraries for videoconferencing
 Name:           farstream
 Name:           farstream
-Version:        0.1.2
-Release:        2%{?_dist_release}
+Version:        0.2.0
+Release:        1%{?_dist_release}
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
@@ -13,11 +13,10 @@ Patch0:		farstream-prefer-vp8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires:	libnice-devel
 BuildRequires:	libnice-devel
-BuildRequires:	gstreamer-devel >= 0.10.33
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.33
+BuildRequires:	gstreamer1-devel >= 0.10.33
+BuildRequires:	gstreamer1-plugins-base-devel >= 0.10.33
 BuildRequires:	python-devel
 BuildRequires:	python-devel
-BuildRequires:	pygobject-devel
-BuildRequires:	gstreamer-python-devel
+BuildRequires:	gobject-introspection-devel
 
 
 Obsoletes:      farsight2 < 0.0.32
 Obsoletes:      farsight2 < 0.0.32
 
 
@@ -79,26 +78,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc README NEWS COPYING ChangeLog AUTHORS
 %doc README NEWS COPYING ChangeLog AUTHORS
-%{_libdir}/libfarstream-0.1.so.*
-%{_libdir}/farstream-0.1/*.so
-%{_libdir}/gstreamer-0.10/*.so
-%{python_sitearch}/farstream.so
+%{_libdir}/farstream-0.2/*.so
+%{_libdir}/gstreamer-1.0/*.so
+%{_libdir}/libfarstream-0.2.so.*
+%{_libdir}/girepository-1.0/Farstream-0.2.typelib
 %{_datadir}/%{name}
 %{_datadir}/%{name}
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{_includedir}/farstream-0.1
-%{_libdir}/pkgconfig/farstream-0.1.pc
-%{_libdir}/libfarstream-0.1.so
+%{_includedir}/farstream-0.2
+%{_libdir}/libfarstream-0.2.so
+%{_libdir}/pkgconfig/farstream-0.2.pc
+%{_datadir}/gir-1.0/Farstream-0.2.gir
 
 
 %files doc
 %files doc
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{_libdir}/libfarstream-0.1.so
-%{_datadir}/gtk-doc/html/farstream-libs-0.10
-%{_datadir}/gtk-doc/html/farstream-plugins-0.1
+%{_datadir}/gtk-doc/html/farstream-libs-1.0
+%{_datadir}/gtk-doc/html/farstream-plugins-0.2
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.0-1
+- new upstream release
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: gstreamer1-plugins-base-devel instead of gstreamer-plugins-base-devel
+- add BuildRequires: gobject-introspection-devel
+
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.2-2
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.2-2
 - add Obsoletes: farsight2
 - add Obsoletes: farsight2
 
 

+ 22 - 28
f/file-roller/file-roller-vl.spec

@@ -1,34 +1,34 @@
-%define glib2_version 2.32.1
-%define gtk3_version 3.4.1
-%define gconf2_version 3.2.0
-%define nautilus_version 3.2.0
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
+%define nautilus_version 3.6.0
 %define desktop_file_utils_version 0.16
 %define desktop_file_utils_version 0.16
-%define gnome_doc_utils_version 0.3.2
 
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Summary:	File Roller is a tool for viewing and creating archives.
 Summary(ja):    File Roller - アーカイブの表示・作成ツール
 Summary(ja):    File Roller - アーカイブの表示・作成ツール
 Name:		file-roller
 Name:		file-roller
-Version:	3.4.2
+Version:	3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
 License:	GPL
 License:	GPL
 Group:		Applications/Archiving
 Group:		Applications/Archiving
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.6/%{name}-%{version}.tar.xz
+
+Patch0:		10_sizeof_gtimeval.patch
 
 
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
-Requires(post,postun): scrollkeeper >= 0.3.11
 Requires(post,postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post,postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(post,pre,preun): GConf2
 
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: json-glib-devel
+BuildRequires: libnotify-devel
+BuildRequires: libarchive-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: yelp-tools
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
 BuildRequires: file-devel
 BuildRequires: file-devel
 BuildRequires: docbook-dtds
 BuildRequires: docbook-dtds
@@ -47,34 +47,24 @@ File Roller は tar ファイルのようなアーカイブの表示や作成を
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-
-# regenerate to fix path
-rm -f src/fr-enum-types.c
+%patch0 -p1 -b .sizeof
 
 
 %build
 %build
 %configure \
 %configure \
-	--disable-scrollkeeper \
 	--enable-magic
 	--enable-magic
-export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+make %{?_smp_mflags}
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export tagname=CC
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-# temporary hack to add missing semicolon, fix sent upstream
-#perl -pi -e 's/Categories=Application;Utility$/Categories=Application;Utility;/' $RPM_BUILD_ROOT%{_datadir}/applications/*
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 desktop-file-install --vendor gnome --delete-original       \
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib*.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib*.*a
 
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
@@ -86,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
-scrollkeeper-update > /dev/null 2>&1 || :
 
 
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -95,7 +84,6 @@ fi
 
 
 %postun
 %postun
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
-scrollkeeper-update > /dev/null 2>&1 || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
@@ -112,7 +100,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/file-roller
 %{_bindir}/file-roller
 %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
 %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
 %{_libexecdir}/file-roller/*
 %{_libexecdir}/file-roller/*
-%{_libexecdir}/file-roller-server
 %{_datadir}/GConf/gsettings/file-roller.convert
 %{_datadir}/GConf/gsettings/file-roller.convert
 %{_datadir}/applications/gnome-file-roller.desktop
 %{_datadir}/applications/gnome-file-roller.desktop
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
@@ -120,7 +107,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
 %{_datadir}/icons/hicolor/*
 %{_datadir}/icons/hicolor/*
 
 
+
 %changelog
 %changelog
+* Sat Oct 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: json-glib-devel, libnotify-devel, libarchive-devel
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+- add Patch0 (10_sizeof_gtimeval.patch)
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 22 - 7
f/folks/folks-vl.spec

@@ -1,24 +1,27 @@
 %define tp_glib_ver	0.18.0
 %define tp_glib_ver	0.18.0
 
 
 Name:           folks
 Name:           folks
-Version:        0.6.9
+Version:        0.7.4.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        GObject contact aggregation library
 Summary:        GObject contact aggregation library
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Folks
 URL:            http://telepathy.freedesktop.org/wiki/Folks
-Source0:        http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/folks/0.7/%{name}-%{version}.tar.xz
 
 
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala >= %{tp_glib_ver}
 BuildRequires:  evolution-data-server-devel >= 3.0.1
 BuildRequires:  evolution-data-server-devel >= 3.0.1
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
-BuildRequires:  libgee-devel
+BuildRequires:  libgee06-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libsocialweb-devel
 BuildRequires:  libsocialweb-devel
-BuildRequires:  vala-devel
-BuildRequires:  vala-tools
+BuildRequires:  libzeitgeist-devel
+#BuildRequires:  vala-devel
+#BuildRequires:  vala-tools
+
+Requires(postun,posttrans):	glib2
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -34,7 +37,7 @@ Summary:        Development files for %{name}
 Group:          Development/Libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:	telepathy-glib-devel >= %{tp_glib_ver}
 Requires:	telepathy-glib-devel >= %{tp_glib_ver}
-Requires:	libgee-devel
+Requires:	libgee06-devel
 Requires:	glib2-devel
 Requires:	glib2-devel
 Requires:	pkgconfig
 Requires:	pkgconfig
 
 
@@ -60,7 +63,12 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
@@ -70,6 +78,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 %{_libdir}/folks
 %{_libdir}/folks
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/GConf/gsettings/folks.convert
+%{_datadir}/glib-2.0/schemas/org.freedesktop.folks.gschema.xml
 %{_datadir}/vala/vapi/%{name}*
 %{_datadir}/vala/vapi/%{name}*
 
 
 %files devel
 %files devel
@@ -81,6 +91,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.4.1-1
+- new upstream release
+- change BuildRequires: libgee06-devel instead of libgee-devel
+- add BuildRequires: libzeitgeist-devel
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.9-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.9-1
 - new upstream release
 - new upstream release
 
 

+ 16 - 11
f/fprintd/fprintd-vl.spec

@@ -4,8 +4,8 @@
 Summary:	D-Bus service for Fingerprint reader access
 Summary:	D-Bus service for Fingerprint reader access
 Summary(ja):	指紋リーダにアクセスするための D-Bus サービス
 Summary(ja):	指紋リーダにアクセスするための D-Bus サービス
 Name:		fprintd
 Name:		fprintd
-Version:	0.1
-Release:	2.git%{short_hash}%{?_dist_release}
+Version:	0.4.1
+Release:	1%{?_dist_release}
 
 
 Group:		System Environment/Daemons
 Group:		System Environment/Daemons
 License:	GPLv2+
 License:	GPLv2+
@@ -16,17 +16,14 @@ License:	GPLv2+
 # mv fprintd-0.1.tar.bz2 fprintd-0.1-%{short_hash}.tar.bz2
 # mv fprintd-0.1.tar.bz2 fprintd-0.1-%{short_hash}.tar.bz2
 URL:		http://www.reactivated.net/fprint/wiki/Fprintd
 URL:		http://www.reactivated.net/fprint/wiki/Fprintd
 
 
-Source0:	fprintd-0.1-%{short_hash}.tar.bz2
-# FIXME remove when we have a newer libfprint
-Patch0:		old-libfprint.patch
-Patch1:		0001-Detect-when-a-device-is-disconnected.patch
+Source0:	http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	pam-devel
 BuildRequires:	pam-devel
 BuildRequires:	libfprint-devel >= 0.1.0
 BuildRequires:	libfprint-devel >= 0.1.0
-BuildRequires:	PolicyKit-devel
+BuildRequires:	polkit-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
 BuildRequires:	perl(XML::Parser) intltool
 BuildRequires:	perl(XML::Parser) intltool
 
 
@@ -58,8 +55,6 @@ fingerprint readers access.
 
 
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 
 %build
 %build
 %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
 %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
@@ -71,10 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/fprint
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/fprint
 
 
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_fprintd.{a,la}
+
+%find_lang %{name}
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS TODO
 %doc README COPYING AUTHORS TODO
 %{_bindir}/fprintd-*
 %{_bindir}/fprintd-*
@@ -83,8 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/fprintd.conf
 %{_sysconfdir}/fprintd.conf
 %{_sysconfdir}/dbus-1/system.d/net.reactivated.Fprint.conf
 %{_sysconfdir}/dbus-1/system.d/net.reactivated.Fprint.conf
 %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service
 %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service
-%{_datadir}/PolicyKit/policy/net.reactivated.fprint.device.policy
+%{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy
 %{_localstatedir}/lib/fprint
 %{_localstatedir}/lib/fprint
+%{_mandir}/man1/fprintd.1.gz
 
 
 %files pam
 %files pam
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -98,6 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp>  0.4.1-1
+- update to 0.4.1
+- change BuildRequires: polkit-devel instead of PolicyKit-devel
+- remove old patches
+
 * Tue May  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 	0.1-2.git04fd09cfa
 * Tue May  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 	0.1-2.git04fd09cfa
 - rebuilt with current VineSeed
 - rebuilt with current VineSeed
 
 

+ 7 - 1
f/fuse/fuse-vl.spec

@@ -1,7 +1,7 @@
 Summary:        File System in Userspace (FUSE) utilities
 Summary:        File System in Userspace (FUSE) utilities
 Summary(ja):	ユーザスペースファイルシステム(FUSE)用のユーティリティ
 Summary(ja):	ユーザスペースファイルシステム(FUSE)用のユーティリティ
 Name:           fuse
 Name:           fuse
-Version:        2.8.5
+Version:        2.9.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
 Group:          System Environment/Base
 Group:          System Environment/Base
@@ -121,6 +121,9 @@ fi
 %{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 %{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 /%{_lib}/libfuse.so.*
 /%{_lib}/libfuse.so.*
 /%{_lib}/libulockmgr.so.*
 /%{_lib}/libulockmgr.so.*
+%{_mandir}/man1/fusermount.1.gz
+%{_mandir}/man1/ulockmgr_server.1.gz
+%{_mandir}/man8/mount.fuse.8.gz
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -133,6 +136,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.9.1-1
+- new upstream release
+
 * Mon Jan 24 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.5-1
 * Mon Jan 24 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.5-1
 - new upstream release
 - new upstream release
 
 

+ 10 - 17
g/gcalctool/gcalctool-vl.spec

@@ -1,25 +1,22 @@
 Name: gcalctool
 Name: gcalctool
-Version: 6.4.2.1
+Version: 6.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Summary: Gnome2 Calculator application
 Summary: Gnome2 Calculator application
 Summary(ja): GNOME2 電卓アプリケーション
 Summary(ja): GNOME2 電卓アプリケーション
 Group: Applications/Productivity
 Group: Applications/Productivity
 License: GPL
 License: GPL
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/6.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/6.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: glib2-devel
 BuildRequires: glib2-devel
-BuildRequires: GConf2-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-devel
-BuildRequires: gnome-doc-utils >= 0.3.2
-BuildRequires: perl-XML-Parser scrollkeeper
+BuildRequires: perl-XML-Parser
 BuildRequires: flex, bison
 BuildRequires: flex, bison
 BuildRequires: docbook-utils
 BuildRequires: docbook-utils
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
-BuildRequires: itstool
-Requires(post,postun): scrollkeeper
-Requires(post,pre,preun): GConf2
+BuildRequires: yelp-tools
+Requires(postun,posttrans): glib2
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -36,14 +33,12 @@ gcalctool は Gtk2 ベースの電卓アプリケーションです。
 %setup -q
 %setup -q
 
 
 %build
 %build
-%configure --disable-schemas-install --disable-scrollkeeper
+%configure --disable-schemas-install
 make %{?_smp_mflsgs}
 make %{?_smp_mflsgs}
 
 
 %install
 %install
 rm -fr $RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 desktop-file-install --vendor gnome --delete-original       \
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -51,17 +46,11 @@ desktop-file-install --vendor gnome --delete-original       \
 
 
 %find_lang %{name} --with-gnome
 %find_lang %{name} --with-gnome
 
 
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
 
 
-%post
-scrollkeeper-update > /dev/null 2>&1 || :
-
 %postun 
 %postun 
-scrollkeeper-update > /dev/null 2>&1 || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %posttrans 
 %posttrans 
@@ -78,6 +67,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.4.2.1-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.4.2.1-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 3
g/gcr/gcr-vl.spec

@@ -2,13 +2,13 @@
 
 
 Summary:	A library for bits of crypto UI and parsing etc.
 Summary:	A library for bits of crypto UI and parsing etc.
 Name:		gcr
 Name:		gcr
-Version:	3.4.1
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	GPL/LGPL
 License:	GPL/LGPL
 Group:		System Environment/Libraries 
 Group:		System Environment/Libraries 
 URL:		http://www.gnome.org 
 URL:		http://www.gnome.org 
 
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRequires:	gtk3-devel 
 BuildRequires:	gtk3-devel 
 BuildRequires:	p11-kit-devel 
 BuildRequires:	p11-kit-devel 
@@ -162,11 +162,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.so
 %{_libdir}/libgck-1.so
 %{_libdir}/libgck-1.so
 %{_libdir}/libgcr-3.so
 %{_libdir}/libgcr-3.so
 %{_libdir}/libgcr-base-3.so
 %{_libdir}/libgcr-base-3.so
-%{_libdir}/pkgconfig/*.pc
 %endif
 %endif
 
 
 
 
 %changelog
 %changelog
+* Fri Sep 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - initial build for Vine Linux
 - initial build for Vine Linux
 
 

+ 4 - 3
g/gdk-pixbuf2/gdk-pixbuf2-vl.spec

@@ -8,7 +8,7 @@
 %endif
 %endif
 
 
 Name:           gdk-pixbuf2
 Name:           gdk-pixbuf2
-Version:        2.26.2
+Version:        2.26.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        An image loading library
 Summary:        An image loading library
 
 
@@ -198,11 +198,12 @@ fi
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/libgdk_pixbuf-2.0.so
 %{_libdir}/libgdk_pixbuf-2.0.so
 %{_libdir}/libgdk_pixbuf_xlib-2.0.so
 %{_libdir}/libgdk_pixbuf_xlib-2.0.so
-%{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
-%{_libdir}/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.4-1
+- new upstream release
+
 * Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.2-1
 * Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.2-1
 - new upstream release
 - new upstream release
 
 

+ 6 - 6
g/gdl/gdl-vl.spec

@@ -1,19 +1,17 @@
-Version:	3.4.2
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 
 
 Name:		gdl
 Name:		gdl
 Summary:	Gnome Docking library
 Summary:	Gnome Docking library
 License:	LGPL
 License:	LGPL
 Group:		Development/Libraries
 Group:		Development/Libraries
-Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/3.4/%{name}-%{version}.tar.xz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/3.6/%{name}-%{version}.tar.xz
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 URL:		http://www.gnome.org/
 URL:		http://www.gnome.org/
 Summary(ja):	GNOMEドッキングライブラリ
 Summary(ja):	GNOMEドッキングライブラリ
 
 
 Requires: 	gtk3 >= 3.0.0
 Requires: 	gtk3 >= 3.0.0
-#Requires: 	libgnomeui >= 2.6.0
 Requires: 	libxml2 >= 2.2.8
 Requires: 	libxml2 >= 2.2.8
-#Requires: 	libglade2 >= 2.0.0
 
 
 BuildRequires: 	gtk3-devel >= 3.0.0
 BuildRequires: 	gtk3-devel >= 3.0.0
 BuildRequires: 	libxml2-devel >= 2.2.8
 BuildRequires: 	libxml2-devel >= 2.2.8
@@ -80,8 +78,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/locale/*/LC_MESSAGES/*
 %{_datadir}/locale/*/LC_MESSAGES/*
-%{_datadir}/gtk-doc/html/gdl-3.0
-
 
 
 %files devel
 %files devel
 %defattr (-, root, root)
 %defattr (-, root, root)
@@ -89,8 +85,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gir-1.0/*.gir
+%{_datadir}/gtk-doc/html/gdl-3.0
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 35 - 43
g/gdm/gdm-vl.spec

@@ -16,23 +16,18 @@
 Summary: The GNOME Display Manager
 Summary: The GNOME Display Manager
 Summary(ja): GNOME ディスプレイマネージャ
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
 Name: gdm
-Version: 3.4.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2+
 License: GPLv2+
 Group: User Interface/X
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
 URL: http://download.gnome.org/sources/gdm
 
 
-Source: http://download.gnome.org/sources/gdm/3.4/gdm-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gdm/3.6/gdm-%{version}.tar.xz
 Source1: gdm-pam
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source2: gdm-autologin-pam
-Source3: gdm-welcome-pam
 Source4: gdm-password.pam
 Source4: gdm-password.pam
 Source5: gdm-smartcard.pam
 Source5: gdm-smartcard.pam
 Source6: gdm-fingerprint.pam
 Source6: gdm-fingerprint.pam
-Source7: gdm-smartcard-16.png
-Source8: gdm-smartcard-48.png
-Source9: gdm-fingerprint-16.png
-Source10: gdm-fingerprint-48.png
 Source11: polkit-gnome-authentication-agent-1.desktop
 Source11: polkit-gnome-authentication-agent-1.desktop
 
 
 Source200: gdm-restart
 Source200: gdm-restart
@@ -40,9 +35,6 @@ Source201: gdm-safe-restart
 Source202: gdm-stop
 Source202: gdm-stop
 Source203: gnome.desktop
 Source203: gnome.desktop
 
 
-Source210: gdm.master.ja.po
-
-
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires(posttrans): dconf
 Requires(posttrans): dconf
 Requires: pam >= %{pam_version}
 Requires: pam >= %{pam_version}
@@ -88,6 +80,8 @@ BuildRequires: libXdmcp-devel
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: accountsservice-devel
 BuildRequires: accountsservice-devel
+BuildRequires: plymouth-devel
+BuildRequires: itstool
 
 
 BuildRequires: dbus-x11
 BuildRequires: dbus-x11
 BuildRequires: dconf-devel
 BuildRequires: dconf-devel
@@ -96,20 +90,16 @@ BuildRequires: gsettings-desktop-schemas
 BuildRequires: gnome-settings-daemon
 BuildRequires: gnome-settings-daemon
 
 
 
 
-Patch0: plymouth.patch
 
 
 # Patch from Fedora
 # Patch from Fedora
 
 
 
 
 # Patch from Ubuntu
 # Patch from Ubuntu
-Patch105: 05_initial_server_on_vt7.patch
 
 
 ## patches for vine
 ## patches for vine
 Patch500: gdm-2.32.1-vine-release.patch
 Patch500: gdm-2.32.1-vine-release.patch
-
-## fix metacity warning
-## http://git.gnome.org/browse/gdm/commit/?h=gnome-2-28&id=98a1649b17320957b9a2521af07d15ba51c187c9
-Patch501: gdm-2.32.0-greeter-login-window-be-dock.patch
+Patch501: gdm-3.6.0-simple-slave-vine.patch
+Patch502: libgdm-correct-invalid-gvariant-format-string.patch
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -152,37 +142,27 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .plymouth
-
-%patch105 -p1 -b .xserver
-
 %patch500 -p1 -b .vine-release
 %patch500 -p1 -b .vine-release
-%patch501 -p1 -b .greeter-login-window-be-dock
-
-cp -f %{SOURCE210} po/ja.po
-
-autoreconf -i -f
+%patch501 -p1 -b .vine
+%patch502 -p1 -b .libgdm
 
 
 %build
 %build
-cp -f %{SOURCE1} data/gdm
-cp -f %{SOURCE2} data/gdm-autologin
-cp -f %{SOURCE3} data/gdm-welcome
-cp -f %{SOURCE4} gui/simple-greeter/extensions/password/gdm-password.pam
-cp -f %{SOURCE5} gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam
-cp -f %{SOURCE6} gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam
-cp -f %{SOURCE7} gui/simple-greeter/extensions/smartcard/icons/16x16/gdm-smartcard.png
-cp -f %{SOURCE8} gui/simple-greeter/extensions/smartcard/icons/48x48/gdm-smartcard.png
-cp -f %{SOURCE9} gui/simple-greeter/extensions/fingerprint/icons/16x16/gdm-fingerprint.png
-cp -f %{SOURCE10} gui/simple-greeter/extensions/fingerprint/icons/48x48/gdm-fingerprint.png
+cp -f %{SOURCE1} data/pam-redhat/gdm.pam
+cp -f %{SOURCE2} data/pam-redhat/gdm-autologin.pam
+cp -f %{SOURCE4} data/pam-redhat/gdm-password.pam
+cp -f %{SOURCE5} data/pam-redhat/gdm-smartcard.pam
+cp -f %{SOURCE6} data/pam-redhat/gdm-fingerprint.pam
 
 
 %configure \
 %configure \
         --with-pam-prefix=%{_sysconfdir} \
         --with-pam-prefix=%{_sysconfdir} \
+        --with-plymouth=yes \
+        --with-default-pam-config=redhat \
         --with-working-directory=%{_localstatedir}/gdm \
         --with-working-directory=%{_localstatedir}/gdm \
         --enable-console-helper \
         --enable-console-helper \
         --disable-scrollkeeper \
         --disable-scrollkeeper \
         --with-console-kit \
         --with-console-kit \
         --enable-split-authentication=yes \
         --enable-split-authentication=yes \
-        --without-selinux
+        --without-selinux \
 
 
 # drop unneeded direct library deps with --as-needed
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
 # libtool doesn't make this easy, so we do it the hard way
@@ -323,8 +303,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %config %{_sysconfdir}/gdm/PostSession/*
 %config %{_sysconfdir}/gdm/PostSession/*
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdm-autologin
 %config %{_sysconfdir}/pam.d/gdm-autologin
+%config %{_sysconfdir}/pam.d/gdm-launch-environment
 %config %{_sysconfdir}/pam.d/gdm-password
 %config %{_sysconfdir}/pam.d/gdm-password
-%config %{_sysconfdir}/pam.d/gdm-welcome
 # not config files
 # not config files
 %{_sysconfdir}/gdm/Xsession
 %{_sysconfdir}/gdm/Xsession
 %{_datadir}/gdm/gdm.schemas
 %{_datadir}/gdm/gdm.schemas
@@ -334,13 +314,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %dir %{_sysconfdir}/gdm/PreSession
 %dir %{_sysconfdir}/gdm/PreSession
 %dir %{_sysconfdir}/gdm/PostSession
 %dir %{_sysconfdir}/gdm/PostSession
 %dir %{_sysconfdir}/gdm/PostLogin
 %dir %{_sysconfdir}/gdm/PostLogin
-#%{_datadir}/gnome-session/sessions/gdm.session
 %{_datadir}/pixmaps/*.png
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
 %{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
-%{_libexecdir}/gdm-factory-slave
+#%{_libexecdir}/gdm-factory-slave
 %{_libexecdir}/gdm-host-chooser
 %{_libexecdir}/gdm-host-chooser
-%{_libexecdir}/gdm-product-slave
+#%{_libexecdir}/gdm-product-slave
 %{_libexecdir}/gdm-session-worker
 %{_libexecdir}/gdm-session-worker
 %{_libexecdir}/gdm-simple-chooser
 %{_libexecdir}/gdm-simple-chooser
 %{_libexecdir}/gdm-simple-greeter
 %{_libexecdir}/gdm-simple-greeter
@@ -351,7 +330,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_sbindir}/gdm-restart
 %{_sbindir}/gdm-restart
 %{_sbindir}/gdm-safe-restart
 %{_sbindir}/gdm-safe-restart
 %{_sbindir}/gdm-stop
 %{_sbindir}/gdm-stop
-%{_bindir}/gdmflexiserver
+#%{_bindir}/gdmflexiserver
 %{_bindir}/gdm-screenshot
 %{_bindir}/gdm-screenshot
 %{_datadir}/gdm/*.ui
 %{_datadir}/gdm/*.ui
 %{_datadir}/gdm/locale.alias
 %{_datadir}/gdm/locale.alias
@@ -371,6 +350,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %dir %{_datadir}/gdm/autostart
 %dir %{_datadir}/gdm/autostart
 %dir %{_datadir}/gdm/autostart/LoginWindow
 %dir %{_datadir}/gdm/autostart/LoginWindow
 %{_datadir}/gdm/autostart/LoginWindow/*
 %{_datadir}/gdm/autostart/LoginWindow/*
+%{_datadir}/gdm/greeter/autostart/orca-autostart.desktop
 %{_datadir}/gdm/greeter/applications/*
 %{_datadir}/gdm/greeter/applications/*
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 %{_datadir}/gnome-session/sessions/gdm-fallback.session
 %{_datadir}/gnome-session/sessions/gdm-fallback.session
@@ -387,8 +367,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files devel
 %files devel
 %defattr(-, root, root)
 %defattr(-, root, root)
-%{_includedir}/gdm/greeter/gdm-greeter-client.h
-%{_includedir}/gdm/greeter/gdm-greeter-sessions.h
+%{_includedir}/gdm/gdm-client-glue.h
+%{_includedir}/gdm/gdm-client.h
+%{_includedir}/gdm/gdm-sessions.h
+%{_includedir}/gdm/gdm-user-switching.h
 %{_includedir}/gdm/simple-greeter/gdm-login-extension.h
 %{_includedir}/gdm/simple-greeter/gdm-login-extension.h
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gir-1.0/*.gir
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
@@ -409,6 +391,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 
 
 %changelog
 %changelog
+* Fri Oct 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- remove Patch0 (plymouth.patch)
+- remove Patch105 (05_initial_server_on_vt7.patch)
+- remove Patch501 (gdm-2.32.0-greeter-login-window-be-dock.patch)
+- add Patch501 (gdm-3.6.0-simple-slave-vine.patch)
+- add Patch502 (libgdm-correct-invalid-gvariant-format-string.patch)
+- add BuildRequires: plymouth-devel, itstool
+- remove Source3,7,8,9,10
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 - update Patch0
 - update Patch0

+ 8 - 17
g/gedit-plugins/gedit-plugins-vl.spec

@@ -1,5 +1,5 @@
 Name:           gedit-plugins
 Name:           gedit-plugins
-Version:        3.4.0
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A collection Official Plugins for gedit
 Summary:        A collection Official Plugins for gedit
 Summary:        gedit の公式プラグイン集
 Summary:        gedit の公式プラグイン集
@@ -7,29 +7,16 @@ Summary:        gedit の公式プラグイン集
 Group:          Applications/Editors
 Group:          Applications/Editors
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins 
 URL:            http://live.gnome.org/GeditPlugins 
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.4/%{name}-%{version}.tar.xz
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  perl >= 5.8.1
 BuildRequires:  perl >= 5.8.1
-BuildRequires:  perl-XML-Parser
-BuildRequires:  gettext
-BuildRequires:  glib2-devel >= 2.24.0
 BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  gtk3-devel >= 3.0.0
-BuildRequires:  gtksourceview2-devel >= 2.5.1
+BuildRequires:  libpeas-devel >= 1.0.0
 BuildRequires:  gedit-devel >= 2.30.0
 BuildRequires:  gedit-devel >= 2.30.0
-BuildRequires:  gucharmap-devel >= 2.30.0
-BuildRequires:  gnome-doc-utils
 BuildRequires:  vte3-devel
 BuildRequires:  vte3-devel
-BuildRequires:  pygtk2-devel >= 2.12.0
-BuildRequires:  pygtksourceview-devel >= 2.2.0
-BuildRequires:  pygobject-devel >= 2.15.4
-BuildRequires:  python-devel
 BuildRequires:  dbus-python-devel
 BuildRequires:  dbus-python-devel
-Requires:       gedit
-Requires:       pygtk2
-Requires:       pygtksourceview
-Requires:       pygobject
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -72,7 +59,7 @@ grep '"import vte' configure && sed \
     -i "s!import vte!import imp; imp.find_module('vte')!" configure
     -i "s!import vte!import imp; imp.find_module('vte')!" configure
 
 
 %build
 %build
-%configure --disable-schemas-install --enable-python
+%configure --enable-python
 #--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal,bookmarks
 #--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal,bookmarks
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
@@ -108,6 +95,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.6.0-1
+- new upstream release
+- remove old required packages
+
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.4.0-1
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.4.0-1
 - new upstream release
 - new upstream release
 - remove BuildRequires: GConf2-devel
 - remove BuildRequires: GConf2-devel

+ 10 - 11
g/gedit/gedit-vl.spec

@@ -1,18 +1,16 @@
-%define glib2_version 2.32.1
-%define gtk3_version 3.4.1
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
 %define desktop_file_utils_version 0.17
 %define desktop_file_utils_version 0.17
-%define gtksourceview3_version 3.4.1
-%define gnome_doc_utils_version 0.6.0
-%define pygobject_version 2.28.6
+%define gtksourceview3_version 3.6.0
 
 
 Summary:	gedit is a small but powerful text editor for GNOME.
 Summary:	gedit is a small but powerful text editor for GNOME.
 Summary(ja):	GNOME 用の小さくかつ強力なテキストエディタ
 Summary(ja):	GNOME 用の小さくかつ強力なテキストエディタ
 Name:		gedit
 Name:		gedit
-Version:	3.4.2
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	GPLv2
 License:	GPLv2
 Group:		Applications/Editors
 Group:		Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.6/%{name}-%{version}.tar.xz
 URL:		http://gedit.sourceforge.net/
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
@@ -22,7 +20,6 @@ BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gtksourceview3-devel >= %{gtksourceview3_version}
 BuildRequires: gtksourceview3-devel >= %{gtksourceview3_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: pygobject3-devel
 BuildRequires: pygobject3-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: perl-XML-Parser
 BuildRequires: libattr-devel
 BuildRequires: libattr-devel
@@ -30,7 +27,7 @@ BuildRequires: libffi-devel
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
 BuildRequires: libpeas-devel >= 0.7.3
 BuildRequires: libpeas-devel >= 0.7.3
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: itstool
+BuildRequires: yelp-tools
 BuildRequires: intltool > 0.40
 BuildRequires: intltool > 0.40
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -89,9 +86,7 @@ make %{?_smp_mflags} V=1
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 desktop-file-install --delete-original       \
 desktop-file-install --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -149,6 +144,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/%{name}/gir-1.0/*.gir
 %{_datadir}/%{name}/gir-1.0/*.gir
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 17 - 10
g/geoclue/geoclue-vl.spec

@@ -2,16 +2,13 @@ Summary:        A modular geoinformation service
 Summary(ja):    モジュール型地理情報サービス
 Summary(ja):    モジュール型地理情報サービス
 
 
 Name:           geoclue
 Name:           geoclue
-Version:        0.12.0
-Release:        3%{?_dist_release}
+Version:        0.12.99
+Release:        1%{?_dist_release}
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 URL:            http://geoclue.freedesktop.org/
-Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
-Patch0:		geoclue-nm08.patch
-Patch1:		geoclue-use-libnm-glib.patch
-Patch2:		geoclue-unused-var.patch
+Source0:        http://freedesktop.org/~hadess/%{name}-%{version}.tar.gz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -81,9 +78,6 @@ A gypsy provider for geoclue
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .nm08
-%patch1 -p1 -b .use-libnm-glib
-%patch2 -p1 -b .unused-var
 
 
 # Need this for the NM-0.8 patch
 # Need this for the NM-0.8 patch
 libtoolize
 libtoolize
@@ -108,7 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -116,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/geoclue-providers
 %dir %{_datadir}/geoclue-providers
 %{_libdir}/libgeoclue.so.0
 %{_libdir}/libgeoclue.so.0
 %{_libdir}/libgeoclue.so.0.0.0
 %{_libdir}/libgeoclue.so.0.0.0
+%{_datadir}/GConf/gsettings/geoclue
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service
@@ -137,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-gsmloc.provider
 %{_datadir}/geoclue-providers/geoclue-gsmloc.provider
 %{_datadir}/geoclue-providers/geoclue-nominatim.provider
 %{_datadir}/geoclue-providers/geoclue-nominatim.provider
 %{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-skyhook.provider
+%{_datadir}/glib-2.0/schemas/org.freedesktop.Geoclue.gschema.xml
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-geonames
 %{_libexecdir}/geoclue-geonames
 %{_libexecdir}/geoclue-hostip
 %{_libexecdir}/geoclue-hostip
@@ -172,6 +173,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.99-1
+- new upstream release
+- remove Patch0 (geoclue-nm08.patch)
+- remove Patch1	(geoclue-use-libnm-glib.patch)
+- remove Patch2 (geoclue-unused-var.patch) 
+
 * Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.0-3
 * Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.0-3
 - rebuild with NetworkManager-0.8.9997
 - rebuild with NetworkManager-0.8.9997
 - add Patch1 (geoclue-use-libnm-glib.patch) from fedora
 - add Patch1 (geoclue-use-libnm-glib.patch) from fedora

+ 8 - 5
g/gjs/gjs-vl.spec

@@ -1,11 +1,11 @@
-%define pkg_version 1.32.0
+%define pkg_version 1.34.0
 %define pkg_release 1%{?_dist_release}
 %define pkg_release 1%{?_dist_release}
 
 
 Summary:     Javascript binding for GNOME
 Summary:     Javascript binding for GNOME
 Name:        gjs
 Name:        gjs
 Version:     %{pkg_version}
 Version:     %{pkg_version}
 Release:     %{pkg_release}
 Release:     %{pkg_release}
-Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.32/%{name}-%{version}.tar.xz
+Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.34/%{name}-%{version}.tar.xz
 
 
 License:     MPL1.1/LGPLv2+/GPLv2+
 License:     MPL1.1/LGPLv2+/GPLv2+
 Group:       User Interface/Desktops
 Group:       User Interface/Desktops
@@ -17,7 +17,7 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel >= 1.29.16
 BuildRequires: gobject-introspection-devel >= 1.29.16
 BuildRequires: cairo-devel
 BuildRequires: cairo-devel
 BuildRequires: js-devel
 BuildRequires: js-devel
-BuildRequires: gnome-doc-utils
+BuildRequires: yelp-tools
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-common
 BuildRequires: gnome-common
 
 
@@ -75,7 +75,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %doc COPYING ChangeLog NEWS README
 %doc COPYING ChangeLog NEWS README
 %{_bindir}/gjs*
 %{_bindir}/gjs*
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
-%{_libdir}/girepository-1.0/GjsDBus-1.0.typelib
+%{_libdir}/gjs/girepository-1.0/GjsPrivate-1.0.typelib
 %{_libdir}/gjs-1.0/*
 %{_libdir}/gjs-1.0/*
 %{_datadir}/gjs-1.0/*
 %{_datadir}/gjs-1.0/*
 
 
@@ -84,10 +84,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %{_includedir}/gjs-1.0
 %{_includedir}/gjs-1.0
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0/GjsDBus-1.0.gir
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.34.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.32.0-1
 * Sun Apr 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.32.0-1
 - new upstream release
 - new upstream release
 
 

+ 4 - 1
g/glabels/glabels-vl.spec

@@ -1,6 +1,6 @@
 Name:		glabels
 Name:		glabels
 Version:	3.0.1
 Version:	3.0.1
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	A program for creating labels and business cards for GNOME
 Summary:	A program for creating labels and business cards for GNOME
 Summary(ja):	GNOME 用のラベルと名刺を作成するためのプログラム
 Summary(ja):	GNOME 用のラベルと名刺を作成するためのプログラム
 
 
@@ -226,6 +226,9 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-2
+- rebuild with evolution-data-server-3.6.0
+
 * Sat Sep 22 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.0.1-1
 * Sat Sep 22 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.0.1-1
 - new upstream release
 - new upstream release
 - changed source archive type bz2 to xz
 - changed source archive type bz2 to xz

+ 10 - 36
g/glade3/glade3-vl.spec

@@ -1,6 +1,6 @@
 %define	helpdir	glade3
 %define	helpdir	glade3
 
 
-Version: 3.12.1
+Version: 3.14.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 
 
 Summary: A user interface builder for the GTK+ toolkit and GNOME
 Summary: A user interface builder for the GTK+ toolkit and GNOME
@@ -9,22 +9,18 @@ Name: glade3
 License: GPL
 License: GPL
 Group: Applications/Development
 Group: Applications/Development
 URL: http://glade.gnome.org/
 URL: http://glade.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.12/glade-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.14/glade-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk3-devel >= 3.0.2
 BuildRequires: gtk3-devel >= 3.0.2
 BuildRequires: libxml2-devel >= 2.4.0 
 BuildRequires: libxml2-devel >= 2.4.0 
-#BuildRequires: libbonoboui-devel
-#BuildRequires: libgnomeui-devel
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
-BuildRequires: gnome-doc-utils
+BuildRequires: yelp-tools
 
 
 Requires: gtk3 >= 3.0.2
 Requires: gtk3 >= 3.0.2
 Requires: libxml2 >= 2.4.0 
 Requires: libxml2 >= 2.4.0 
 #Requires: libbonoboui
 #Requires: libbonoboui
-#Requires: libgnomeui
 Requires: devhelp
 Requires: devhelp
-Requires(pre): scrollkeeper
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -55,10 +51,6 @@ http://glade.gnome.org/glade-2.0.dtdにもあります。
 Summary:	the Glade UI Builder core library
 Summary:	the Glade UI Builder core library
 Group:		Development/Libraries
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtk2-devel >= 2.12.0
-Requires:	libxml2-devel >= 2.4.0 
-Requires:	libbonoboui-devel
-Requires:	libgnomeui-devel
 
 
 %description devel
 %description devel
 the Glade UI Builder core library to integrate Glade into your application
 the Glade UI Builder core library to integrate Glade into your application
@@ -76,44 +68,25 @@ popd
 
 
 
 
 %build
 %build
-%configure --disable-scrollkeeper --disable-static
+%configure --disable-static
 %__make %{_smp_mflags}
 %__make %{_smp_mflags}
 
 
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-#desktop-file-install \
-#	--vendor gnome \
-#	--delete-original \
-#	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-#	$RPM_BUILD_ROOT%{_datadir}/applications/*
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -f $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgladeui-2.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgladeui-2.la
 
 
-## change gnome help directory
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/glade $RPM_BUILD_ROOT%{_datadir}/gnome/help/%{helpdir}
-mv $RPM_BUILD_ROOT%{_datadir}/omf/glade $RPM_BUILD_ROOT%{_datadir}/omf/%{helpdir}
-pushd $RPM_BUILD_ROOT%{_datadir}/omf/%{helpdir}
-files=`ls *.omf`
-for omf in $files; do
-	mv $omf $omf.orig
-	sed "s|help/glade/|help/%{helpdir}/|g" $omf.orig > $omf
-	rm $omf.orig
-done
-popd
-      
-%find_lang glade
+%find_lang glade --all-name --with-gnome
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
 /sbin/ldconfig
 /sbin/ldconfig
-scrollkeeper-update -p /var/lib/scrollkeeper -o %{_datadir}/omf/%{helpdir}
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -121,7 +94,6 @@ fi
 
 
 %postun
 %postun
 /sbin/ldconfig
 /sbin/ldconfig
-scrollkeeper-update > /dev/null 2>&1 || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -136,9 +108,7 @@ fi
 %{_libdir}/girepository-1.0/Gladeui-2.0.typelib
 %{_libdir}/girepository-1.0/Gladeui-2.0.typelib
 %{_datadir}/applications/glade.desktop
 %{_datadir}/applications/glade.desktop
 %{_datadir}/glade
 %{_datadir}/glade
-%{_datadir}/gnome/help/%{helpdir}
 %{_datadir}/icons/hicolor/*/apps/glade.png
 %{_datadir}/icons/hicolor/*/apps/glade.png
-%{_datadir}/omf/%{helpdir}
 
 
 %files	devel
 %files	devel
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -149,6 +119,10 @@ fi
 %{_datadir}/gtk-doc/html/gladeui-2
 %{_datadir}/gtk-doc/html/gladeui-2
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sat May 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.12.1-1
 * Sat May 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.12.1-1
 - new upstream release
 - new upstream release
 
 

+ 11 - 8
g/glib-networking/glib-networking-vl.spec

@@ -1,21 +1,21 @@
 Name:           glib-networking
 Name:           glib-networking
-Version:        2.32.3
+Version:        2.34.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Networking support for GLib
 Summary:        Networking support for GLib
 
 
 Group:          Development/Libraries
 Group:          Development/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.gnome.org
 URL:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/glib-networking/2.32/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/glib-networking/2.34/%{name}-%{version}.tar.xz
 
 
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  intltool
 BuildRequires:  intltool
 BuildRequires:  gsettings-desktop-schemas-devel
 BuildRequires:  gsettings-desktop-schemas-devel
-# need to build ca-bundle.crt 
-BuildRequires:  openssl
-Requires:       openssl
+BuildRequires:  ca-certificates
+
+Requires:  ca-certificates
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -32,10 +32,9 @@ and a gnutls-based GTlsConnection implementation.
 
 
 %build
 %build
 %configure \
 %configure \
-	--with-libproxy \
-	--with-ca-certificates=%{_datadir}/ssl/certs/ca-bundle.crt
+	--with-libproxy 
 
 
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 
 
 
 %install
 %install
@@ -63,6 +62,10 @@ gio-querymodules %{_libdir}/gio/modules
 
 
 
 
 %changelog
 %changelog
+* Fri Sep 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.34.0-1
+- new upstream release
+- change BuildRequires: ca-certificates instead of openssl
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.3-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.3-1
 - new upstream release
 - new upstream release
 
 

+ 9 - 7
g/glib2/glib2-vl.spec

@@ -4,11 +4,11 @@
 
 
 Summary: A library of handy utility functions.
 Summary: A library of handy utility functions.
 Name: glib2
 Name: glib2
-Version: 2.32.4
+Version: 2.34.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: LGPLv2+
 License: LGPLv2+
 Group: System Environment/Libraries
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.34/glib-%{version}.tar.xz
 Source2: glib2.sh
 Source2: glib2.sh
 Source3: glib2.csh
 Source3: glib2.csh
 
 
@@ -37,7 +37,7 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 object system.
 
 
-This package provides version 2.32 of GLib.
+This package provides version 2.34 of GLib.
 
 
 %package devel
 %package devel
 Summary: Development files for the GLib library
 Summary: Development files for the GLib library
@@ -52,7 +52,7 @@ Conflicts: glib-devel <= 1.2.8
 
 
 %description devel
 %description devel
 The glib-devel package includes the header files for 
 The glib-devel package includes the header files for 
-version 2.32 of the GLib library. 
+version 2.34 of the GLib library. 
 
 
 
 
 ## to build compat32 for x86_64 architecture support
 ## to build compat32 for x86_64 architecture support
@@ -67,7 +67,7 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 object system.
 
 
-This package provides version 2.32 of GLib.
+This package provides version 2.34 of GLib.
 
 
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary: Development files for the GLib library
 Summary: Development files for the GLib library
@@ -79,7 +79,7 @@ Conflicts: glib-devel <= 1.2.8
 
 
 %description -n compat32-%{name}-devel
 %description -n compat32-%{name}-devel
 The glib-devel package includes the header files for 
 The glib-devel package includes the header files for 
-version 2.32 of the GLib library. 
+version 2.34 of the GLib library. 
 
 
 %prep
 %prep
 %setup -q -n glib-%{version}
 %setup -q -n glib-%{version}
@@ -185,10 +185,12 @@ gio-querymodules %{_libdir}/gio/modules
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
 %{_libdir}/lib*.a
 %{_libdir}/glib-2.0
 %{_libdir}/glib-2.0
-%{_libdir}/pkgconfig/*
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Sep 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.34.0-1
+- new upstream release
+
 * Mon Jul 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.4-1
 * Mon Jul 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.4-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
g/glibmm/glibmm-vl.spec

@@ -3,12 +3,12 @@
 Summary:	A C++ interface for glib library.
 Summary:	A C++ interface for glib library.
 Summary(ja):	glib ライブラリの C++ インターフェイス
 Summary(ja):	glib ライブラリの C++ インターフェイス
 Name:		glibmm
 Name:		glibmm
-Version:	2.32.1
+Version:	2.33.13
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	LGPL
 License:	LGPL
 Group:		System Environment/Libraries
 Group:		System Environment/Libraries
 URL:		http://www.gtkmm.org/
 URL:		http://www.gtkmm.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.32/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.33/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:       glib2 >= 2.26.0
 Requires:       glib2 >= 2.26.0
 Requires:       libsigc++ >= 2.0.0
 Requires:       libsigc++ >= 2.0.0
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/devhelp/books/glibmm-%{ver}
 %{_datadir}/devhelp/books/glibmm-%{ver}
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.33.13-1
+- new upstream release
+
 * Tue Jul 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 * Tue Jul 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 - new upstream release
 
 

+ 12 - 17
g/gnome-applets/gnome-applets-vl.spec

@@ -27,25 +27,20 @@
 Summary:        Small applications for the GNOME panel.
 Summary:        Small applications for the GNOME panel.
 Summary(ja):    GNOME パネル用の小さなアプリケーション(GNOMEパネルアプレット)
 Summary(ja):    GNOME パネル用の小さなアプリケーション(GNOMEパネルアプレット)
 Name:     	gnome-applets
 Name:     	gnome-applets
-Version: 	3.4.1
+Version: 	3.5.92
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 License:	GPL
 License:	GPL
 Group:          User Interface/Desktops
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 URL:		http://www.gnome.org/
 
 
-Source: 	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source: 	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.5/%{name}-%{version}.tar.xz
 Source10:	cpufreq-selector.app
 Source10:	cpufreq-selector.app
 Source11:	cpufreq-selector.pam
 Source11:	cpufreq-selector.pam
 
 
 Patch2:		gnome-applets-2.23.3-use-builtin-apm.patch
 Patch2:		gnome-applets-2.23.3-use-builtin-apm.patch
 
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=424639
-Patch31:        gnome-applets-2.18.0-fix-find.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
-Requires(post,postun): scrollkeeper >= 0.1.4
-
 BuildRequires:  gnome-common
 BuildRequires:  gnome-common
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
@@ -69,7 +64,7 @@ BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-proto-devel
 # for patch 39
 # for patch 39
 BuildRequires:  NetworkManager-devel
 BuildRequires:  NetworkManager-devel
-BuildRequires:  libgweather-devel >= %{libgweather_version}
+#BuildRequires:  libgweather-devel >= %{libgweather_version}
 # For cpufreq
 # For cpufreq
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-devel
 BuildRequires:	polkit-devel
 BuildRequires:	polkit-devel
@@ -78,6 +73,7 @@ BuildRequires:  gucharmap-devel >= %{gucharmap_version}
 BuildRequires:  libSM-devel
 BuildRequires:  libSM-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  pygtk2-devel
 
 
+Requires(pre,preun,postun):	GConf2
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	gnome-desktop3 >= %{gnome_desktop3_version}
 Requires:	gnome-desktop3 >= %{gnome_desktop3_version}
 Requires:	libxklavier >= %{libxklavier_version}
 Requires:	libxklavier >= %{libxklavier_version}
@@ -102,14 +98,12 @@ small utilities for the GNOME panel.
 %setup -q
 %setup -q
 %patch2 -p1 -b .use-builtin-apm
 %patch2 -p1 -b .use-builtin-apm
 
 
-## %patch31 -p1 -b .fix-find
-
 %build
 %build
 
 
 intltoolize --force
 intltoolize --force
 autoreconf
 autoreconf
 
 
-%configure --disable-scrollkeeper \
+%configure --disable-static \
 	   --enable-mini-commander
 	   --enable-mini-commander
 %__make %{?_smp_mflags}
 %__make %{?_smp_mflags}
 
 
@@ -123,7 +117,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang %{po_package} --all-name --with-gnome
 %find_lang %{po_package} --all-name --with-gnome
 
 
 # remove unpackaged files
 # remove unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a
 
 
 # drop non-XKB support files
 # drop non-XKB support files
@@ -134,7 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
 /sbin/ldconfig
 /sbin/ldconfig
-scrollkeeper-update -q > /dev/null 2>&1 || :
 
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule                                        \
 gconftool-2 --makefile-install-rule                                        \
@@ -143,11 +135,11 @@ gconftool-2 --makefile-install-rule                                        \
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
-	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+#	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 %{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
 %{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
 
 
 %pre
 %pre
@@ -160,11 +152,11 @@ if [ "$1" -gt 1 ]; then
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/gswitchit.schemas                 \
 	    %{_sysconfdir}/gconf/schemas/gswitchit.schemas                 \
-	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+#	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
   if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
   if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
      gconftool-2 --makefile-uninstall-rule \
      gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
             %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
@@ -180,16 +172,15 @@ if [ "$1" -eq 0 ]; then
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
-	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+#	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 fi
 fi
 
 
 %postun 
 %postun 
 /sbin/ldconfig
 /sbin/ldconfig
-scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -215,6 +206,10 @@ fi
 %{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
 %{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
 
 
 %changelog
 %changelog
+* Sun Sep 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.91-1
+- new upstream release
+- remove BuildRequires: libgweather-devel
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
g/gnome-backgrounds/gnome-backgrounds-vl.spec

@@ -1,13 +1,13 @@
 Summary:        Gnome Background images
 Summary:        Gnome Background images
 Summary(ja):    Gnome バックグラウンド画像
 Summary(ja):    Gnome バックグラウンド画像
 Name:           gnome-backgrounds
 Name:           gnome-backgrounds
-Version:        3.4.2
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 License:        GPL
 License:        GPL
 Group:          User Interface/Desktops
 Group:          User Interface/Desktops
 URL:            http://www.gnome.org/
 URL:            http://www.gnome.org/
 
 
-Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 BuildArch:      noarch
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-background-properties
 %{_datadir}/gnome-background-properties
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 13 - 20
g/gnome-bluetooth/gnome-bluetooth-vl.spec

@@ -1,12 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Summary: GNOME Bluetooth Subsystem
 Summary(ja): GNOME Bluetooth サブシステム
 Summary(ja): GNOME Bluetooth サブシステム
 Name: gnome-bluetooth
 Name: gnome-bluetooth
-Version: 3.4.2
-Release: 2%{?_dist_release}
+Version: 3.6.0
+Release: 1%{?_dist_release}
 License: GPLv2+
 License: GPLv2+
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth
 URL: http://live.gnome.org/GnomeBluetooth
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/3.6/%{name}-%{version}.tar.xz
 Source1: 61-gnome-bluetooth-rfkill.rules
 Source1: 61-gnome-bluetooth-rfkill.rules
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -19,6 +19,7 @@ BuildRequires: libnotify-devel
 BuildRequires: nautilus-sendto-devel
 BuildRequires: nautilus-sendto-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: intltool, automake, libtool, gettext
 BuildRequires: intltool, automake, libtool, gettext
+BuildRequires: itstool
 
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: bluez >= 4.42
 Requires: bluez >= 4.42
@@ -27,7 +28,10 @@ Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires(postun): desktop-file-utils
 ExcludeArch: s390 s390x
 ExcludeArch: s390 s390x
 
 
-## Patch1: gnome-bluetooth-0.8.0-desktop.patch
+Obsoletes: bluez-gnome < 1.9
+
+# virtual package
+Provides:       dbus-bluez-pin-helper
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -119,22 +123,6 @@ install -m0644 -D %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/61-gnome-bluetooth
 %find_lang %{name} --with-gnome
 %find_lang %{name} --with-gnome
 cat %{name}.lang >> gnome-bluetooth2.lang
 cat %{name}.lang >> gnome-bluetooth2.lang
 
 
-# save space by linking identical images in translated docs
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
-  b="$(basename $f)"
-  for d in $helpdir/*; do
-    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-      g="$d/figures/$b"
-      if [ -f "$g" ]; then
-        if cmp -s $f $g; then
-          rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi
-      fi
-    fi
-  done
-done
-
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 
 
@@ -212,6 +200,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add Obsoletes: bluez-gnome < 1.9
+- add BuildRequires: itstool
+
 * Sun Jul 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-2
 * Sun Jul 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-2
 - fix spec file
 - fix spec file
 
 

+ 11 - 12
g/gnome-color-manager/gnome-color-manager-vl.spec

@@ -2,22 +2,18 @@
 
 
 Summary:   Color management tools for GNOME
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
 Name:      gnome-color-manager
-Version:   3.4.2
-Release:   2%{?_dist_release}
+Version:   3.6.0
+Release:   1%{?_dist_release}
 License:   GPLv2+
 License:   GPLv2+
 Group:     Applications/System
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
 URL:       http://projects.gnome.org/gnome-color-manager/
-Source0:   http://download.gnome.org/sources/gnome-color-manager/3.4/%{name}-%{version}.tar.xz
+Source0:   http://download.gnome.org/sources/gnome-color-manager/3.6/%{name}-%{version}.tar.xz
 
 
 Requires:  gnome-icon-theme
 Requires:  gnome-icon-theme
 Requires:  shared-mime-info
 Requires:  shared-mime-info
 Requires:  shared-color-profiles
 Requires:  shared-color-profiles
-Requires(pre):    GConf2
-Requires(post):   GConf2
-Requires(preun):  GConf2
 
 
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: gtk3-devel >= 3.0.0
-BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gettext
@@ -31,7 +27,6 @@ BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXrandr-devel
 BuildRequires: gnome-desktop3-devel
 BuildRequires: gnome-desktop3-devel
-BuildRequires: lcms-devel
 BuildRequires: cups-devel
 BuildRequires: cups-devel
 BuildRequires: sane-devel
 BuildRequires: sane-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtiff-devel
@@ -42,10 +37,11 @@ BuildRequires: gnome-settings-daemon-devel
 BuildRequires: libusb1-devel
 BuildRequires: libusb1-devel
 BuildRequires: control-center-devel
 BuildRequires: control-center-devel
 BuildRequires: exiv2-devel
 BuildRequires: exiv2-devel
-BuildRequires: colord-devel
+BuildRequires: colord-gtk-devel
 BuildRequires: clutter-gtk-devel
 BuildRequires: clutter-gtk-devel
 BuildRequires: libmash-devel
 BuildRequires: libmash-devel
 BuildRequires: gnome-common
 BuildRequires: gnome-common
+BuildRequires: yelp-tools
 
 
 Obsoletes: %{name}-libs < 3.1.0
 Obsoletes: %{name}-libs < 3.1.0
 Obsoletes: %{name}-devel < 3.1.0
 Obsoletes: %{name}-devel < 3.1.0
@@ -63,8 +59,7 @@ and generate color profiles in the GNOME desktop.
 %setup -q
 %setup -q
 
 
 %build
 %build
-autoreconf -if
-%configure --disable-scrollkeeper --disable-schemas-install
+%configure --disable-static
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
 %install
 %install
@@ -104,7 +99,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gcm-*
 %{_bindir}/gcm-*
-%{_libexecdir}/gcm-calibrate-helper
 %{_libexecdir}/gcm-helper-exiv
 %{_libexecdir}/gcm-helper-exiv
 %{_datadir}/applications/gcm-*.desktop
 %{_datadir}/applications/gcm-*.desktop
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}
@@ -118,6 +112,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: colord-gtk-devel instead of colord-devel
+- add BuildRequires: yelp-tools
+
 * Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-2
 * Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-2
 - rebuild with exiv2-0.23
 - rebuild with exiv2-0.23
 
 

+ 5 - 2
g/gnome-common/gnome-common-vl.spec

@@ -1,14 +1,14 @@
 Summary:        Useful things common to building gnome packages from scratch
 Summary:        Useful things common to building gnome packages from scratch
 
 
 Name:           gnome-common
 Name:           gnome-common
-Version:        3.4.0.1
+Version:        3.5.91
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
 Group:          Development/Tools
 Group:          Development/Tools
 BuildArch:      noarch
 BuildArch:      noarch
 License:        GPLv2
 License:        GPLv2
 URL:            http://developer.gnome.org
 URL:            http://developer.gnome.org
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/3.5/%{name}-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor:		Project Vine
 Vendor:		Project Vine
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/%{name}
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.91-1
+- new upstream release
+
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0.1-1
 * Sat Apr 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0.1-1
 - new upstream release
 - new upstream release
 
 

+ 21 - 19
g/gnome-desktop3/gnome-desktop3-vl.spec

@@ -1,7 +1,6 @@
-%define glib2_version 2.32.1
-%define pango_version 1.30.0
-%define gtk3_version 3.4.1
-%define gconf2_version 3.2.5
+%define glib2_version 2.34.0
+%define pango_version 1.32.0
+%define gtk3_version 3.6.0
 %define startup_notification_version 0.10
 %define startup_notification_version 0.10
 
 
 %define po_package gnome-desktop-3.0
 %define po_package gnome-desktop-3.0
@@ -9,10 +8,10 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Summary(ja): gnome-panel, gnome-session, nautilus などの共用プログラム
 Summary(ja): gnome-panel, gnome-session, nautilus などの共用プログラム
 Name: gnome-desktop3
 Name: gnome-desktop3
-Version: 3.4.2
+Version: 3.6.0.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.4/gnome-desktop-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.6/gnome-desktop-%{version}.tar.xz
 License: GPL 
 License: GPL 
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 
 
@@ -25,23 +24,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # Requires for Vine
 # Requires for Vine
 Requires: ibus-gtk3
 Requires: ibus-gtk3
 Requires: gnome-icon-theme-symbolic
 Requires: gnome-icon-theme-symbolic
+Requires: gnome-themes
 Requires: gnome-themes-standard
 Requires: gnome-themes-standard
+Requires: gnome-themes-vine
 Requires: gsettings-desktop-schemas
 Requires: gsettings-desktop-schemas
 
 
-Requires(post,postun): scrollkeeper
 Obsoletes: gnome-core gnome-core-devel
 Obsoletes: gnome-core gnome-core-devel
 Provides: gnome-core
 Provides: gnome-core
 
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXrandr-devel
+BuildRequires: libxkbfile-devel
+BuildRequires: xkeyboard-config
 BuildRequires: autoconf, automake
 BuildRequires: autoconf, automake
-BuildRequires: gnome-doc-utils
+BuildRequires: yelp-tools
 BuildRequires: docbook-utils
 BuildRequires: docbook-utils
-BuildRequires: gsettings-desktop-schemas-devel
 
 
 %description
 %description
 
 
@@ -58,7 +59,6 @@ Requires: %{name} = %{version}-%{release}
 
 
 Requires: glib2-devel >= %{glib2_version}
 Requires: glib2-devel >= %{glib2_version}
 Requires: gtk3-devel >= %{gtk3_version}
 Requires: gtk3-devel >= %{gtk3_version}
-Requires: GConf2-devel >= %{gconf2_version}
 Requires: startup-notification-devel >= %{startup_notification_version}
 Requires: startup-notification-devel >= %{startup_notification_version}
 
 
 %description devel
 %description devel
@@ -76,7 +76,7 @@ make %{?_smp_mflags}
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -86,13 +86,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
-/sbin/ldconfig
-scrollkeeper-update
+%post -p /sbin/ldconfig
 
 
-%postun 
-/sbin/ldconfig
-scrollkeeper-update
+%postun -p /sbin/ldconfig
 
 
 
 
 %files -f %{po_package}.lang
 %files -f %{po_package}.lang
@@ -100,9 +96,10 @@ scrollkeeper-update
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
+%{_libexecdir}/gnome-rr-debug
 %{_datadir}/libgnome-desktop-3.0
 %{_datadir}/libgnome-desktop-3.0
 %{_datadir}/gnome/*
 %{_datadir}/gnome/*
-%{_datadir}/omf/*
+%{_datadir}/help/*/*/*
 
 
 %files devel
 %files devel
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -113,6 +110,11 @@ scrollkeeper-update
 %{_datadir}/gtk-doc
 %{_datadir}/gtk-doc
 
 
 %changelog
 %changelog
+* Wed Oct 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0.1-1
+- new upstream release
+- add BuildRequires: libxkbfile-devel, xkeyboard-config
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
g/gnome-devel-docs/gnome-devel-docs-vl.spec

@@ -1,12 +1,12 @@
 Summary: GNOME developer documentation
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
 Name: gnome-devel-docs
-Version: 3.4.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GFDL
 License: GFDL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: http://library.gnome.org
 URL: http://library.gnome.org
 #VCS: git:git://git.gnome.org/gnome-devel-docs
 #VCS: git:git://git.gnome.org/gnome-devel-docs
-Source: http://download.gnome.org/sources/gnome-devel-docs/3.4/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gnome-devel-docs/3.6/%{name}-%{version}.tar.xz
 BuildArch: noarch
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: rarian-compat
 BuildRequires: rarian-compat
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README AUTHORS NEWS COPYING
 %doc README AUTHORS NEWS COPYING
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.6.0-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.4.1-1
 - new upstream release
 - new upstream release
 
 

+ 110 - 0
g/gnome-dictionary/gnome-dictionary-vl.spec

@@ -0,0 +1,110 @@
+Summary:	GNOME Dictionary
+Summary(ja):	GNOME 辞書
+Name:		gnome-dictionary
+Version:	3.6.0
+Release:	1%{?_dist_release}
+License:	GPLv2+
+Group:		User Interface/Desktops
+URL:		http://www.gnome.org
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gtk3-devel
+BuildRequires:	itstool
+
+Requires(postun,posttrans):	glib2
+Requires(postun,posttrans):	desktop-file-utils
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+
+%description
+gnome-dictionary provides dictionary definitions of words, using a dictionary source.
+
+%description -l ja
+gnome-dictionary は辞書ソースを使用し、単語の辞書上の定義を提供します。
+
+
+%package        devel
+Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発ファイル
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       gobject-introspection-devel
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%package        doc
+Summary:        Documentation for %{name}
+Summary(ja):    %{name} 用のドキュメント
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+This package contains documentation for %{name}.
+
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+
+%find_lang %{name} --all-name --with-gnome
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_libdir}/libgdict-1.0.so.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/gdict-1.0/sources/*.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml
+%{_datadir}/%{name}/*.ui
+%{_mandir}/man1/%{name}.1.gz
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gdict-1.0
+%{_libdir}/libgdict-1.0.so
+%{_libdir}/pkgconfig/gdict-1.0.pc
+
+%files doc
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/gdict
+
+%changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- initial build

+ 30 - 8
g/gnome-disk-utility/gnome-disk-utility-vl.spec

@@ -1,12 +1,12 @@
-%define glib2_version             2.32.0
-%define gtk3_version              3.4.0
+%define glib2_version             2.34.0
+%define gtk3_version              3.6.0
 %define gnome_doc_utils_version   0.3.2
 %define gnome_doc_utils_version   0.3.2
-%define udisks2_version           1.90.0
+%define udisks2_version           1.99.0
 
 
 Summary: Disk management application
 Summary: Disk management application
 Summary(ja): ディスク管理アプリケーション
 Summary(ja): ディスク管理アプリケーション
 Name: gnome-disk-utility
 Name: gnome-disk-utility
-Version: 3.4.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: LGPLv2+
 License: LGPLv2+
 Group: System Environment/Libraries
 Group: System Environment/Libraries
@@ -16,15 +16,21 @@ Source0: %{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
-Requires: desktop-file-utils
+Requires(post,postun): desktop-file-utils
+Requires(postun,posttrans): glib2
 
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: udisks2-devel >= %{udisks2_version}
 BuildRequires: udisks2-devel >= %{udisks2_version}
+BuildRequires: libsecret-devel >= 0.7
+BuildRequires: libpwquality-devel >= 1.0.0
 BuildRequires: intltool
 BuildRequires: intltool
+BuildRequires: docbook-style-xsl
+BuildRequires: autoconf
+BuildRequires: gnome-common
+BuildRequires: yelp-tools
 
 
 Obsoletes: gnome-disk-utility-format
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 Obsoletes: nautilus-gdu
@@ -51,6 +57,7 @@ RAID, SMART monitoring, etc.
 %setup -q
 %setup -q
 
 
 %build
 %build
+autoreconf -if
 %configure
 %configure
 make
 make
 
 
@@ -79,18 +86,33 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 fi
 update-desktop-database %{_datadir}/applications &> /dev/null
 update-desktop-database %{_datadir}/applications &> /dev/null
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
 %doc COPYING NEWS README
-%{_bindir}/palimpsest
-%{_datadir}/applications/palimpsest.desktop
+%{_bindir}/gnome-disk-image-mounter
+%{_bindir}/gnome-disks
+%{_datadir}/applications/gnome-disk-image-mounter.desktop
+%{_datadir}/applications/gnome-disks.desktop
 %{_datadir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/glib-2.0/schemas/org.gnome.Disks.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
+%{_mandir}/man1/gnome-disk-image-mounter.1.gz
+%{_mandir}/man1/gnome-disks.1.gz
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libsecret-devel, libpwquality-devel, docbook-style-xsl
+- add BuildRequires: autoconf, gnome-common
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Mon Apr 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 
 

+ 12 - 2
g/gnome-documents/gnome-documents-vl.spec

@@ -1,10 +1,10 @@
 # Basic Information
 # Basic Information
 Name:		gnome-documents
 Name:		gnome-documents
-Version:	0.4.2
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	GPLv2
 License:	GPLv2
 Group:		Applications/Documentation
 Group:		Applications/Documentation
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-documents/0.4/gnome-documents-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-documents/3.6/gnome-documents-%{version}.tar.xz
 # Start testing
 # Start testing
 #Source1:	http://l10n.gnome.org/POT/gnome-documents.master/gnome-documents.master.ja.po
 #Source1:	http://l10n.gnome.org/POT/gnome-documents.master/gnome-documents.master.ja.po
 # End testing
 # End testing
@@ -25,6 +25,7 @@ BuildRequires:	gnome-online-accounts-devel
 BuildRequires:	libgdata-devel
 BuildRequires:	libgdata-devel
 BuildRequires:	liboauth-devel
 BuildRequires:	liboauth-devel
 BuildRequires:	tracker-devel
 BuildRequires:	tracker-devel
+BuildRequires:	libzapojit-devel
 BuildRequires:	gjs-devel
 BuildRequires:	gjs-devel
 
 
 
 
@@ -91,12 +92,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %doc COPYING NEWS README
 %doc COPYING NEWS README
 %{_bindir}/gnome-documents
 %{_bindir}/gnome-documents
 %{_libdir}/%{name}/girepository-1.0/Gd-1.0.typelib
 %{_libdir}/%{name}/girepository-1.0/Gd-1.0.typelib
+%{_libdir}/%{name}/girepository-1.0/GdPrivate-1.0.typelib
 %{_libdir}/%{name}/libgdprivate-1.0.so
 %{_libdir}/%{name}/libgdprivate-1.0.so
+%{_libdir}/%{name}/libgd.so
+%{_libdir}/%{name}/libgdminer-1.0.so
 %{_libexecdir}/gd-tracker-gdata-miner
 %{_libexecdir}/gd-tracker-gdata-miner
+%{_libexecdir}/gd-tracker-zpj-miner
 %{_libexecdir}/gnome-documents-search-provider
 %{_libexecdir}/gnome-documents-search-provider
 %{_datadir}/applications/gnome-documents.desktop
 %{_datadir}/applications/gnome-documents.desktop
 %{_datadir}/dbus-1/services/org.gnome.Documents.GDataMiner.service
 %{_datadir}/dbus-1/services/org.gnome.Documents.GDataMiner.service
 %{_datadir}/dbus-1/services/org.gnome.Documents.SearchProvider.service
 %{_datadir}/dbus-1/services/org.gnome.Documents.SearchProvider.service
+%{_datadir}/dbus-1/services/org.gnome.Documents.ZpjMiner.service
 %{_datadir}/glib-2.0/schemas/org.gnome.documents.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.documents.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.Documents.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.Documents.enums.xml
 %{_datadir}/gnome-documents
 %{_datadir}/gnome-documents
@@ -113,6 +119,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/%{name}/gir-1.0/Gd-1.0.gir
 %{_datadir}/%{name}/gir-1.0/Gd-1.0.gir
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: libzapojit-devel
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.2-1
 - new upstream release
 - new upstream release
 - add BuildRequires: gjs-devel
 - add BuildRequires: gjs-devel

+ 61 - 0
g/gnome-font-viewer/gnome-font-viewer-vl.spec

@@ -0,0 +1,61 @@
+Summary:	GNOME font viewer
+Summary(ja):	GNOME フォントビューアー
+Name:		gnome-font-viewer
+Version:	3.6.0
+Release:	1%{?_dist_release}
+License:	GPLv2+
+Group:		User Interface/Desktops
+URL:		http://www.gnome.org
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gtk3-devel
+BuildRequires:	gnome-desktop3-devel
+
+Requires(postun,posttrans):	desktop-file-utils
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+
+%description
+%{summary}
+
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%postun
+update-desktop-database -q &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_bindir}/gnome-thumbnail-font
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/thumbnailers/gnome-font-viewer.thumbnailer
+
+%changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- initial build

+ 20 - 41
g/gnome-games/gnome-games-vl.spec

@@ -2,18 +2,15 @@
 
 
 %define gettext_package gnome-games
 %define gettext_package gnome-games
 
 
-%define glib2_version 2.32.1
-%define pango_version 1.30.0
-%define gtk3_version 3.4.1
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
 %define desktop_file_utils_version 0.2.90
 %define desktop_file_utils_version 0.2.90
-%define gnome_python_desktop 2.30.0
-%define gstreamer_version 0.10.30
 
 
 Summary: GNOME games
 Summary: GNOME games
 Summary(ja): GNOME ゲーム集
 Summary(ja): GNOME ゲーム集
 Name: gnome-games
 Name: gnome-games
-%define major 3.4
-Version: %{major}.2
+%define major 3.6
+Version: %{major}.0.2
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL+
 License: GPLv2+ and GFDL+
 Group: Applications/Games
 Group: Applications/Games
@@ -24,44 +21,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome gnome-games-devel
 Obsoletes: gnome gnome-games-devel
 URL: http://www.gnome.org
 URL: http://www.gnome.org
 
 
-Requires(post,postun): scrollkeeper >= 0.1.4
+Requires(postun,posttrans): desktop-file-utils
+Requires(postun,posttrans): glib2
 
 
-Requires: pygtk2
+#Requires: pygtk2
 Requires: pygobject3
 Requires: pygobject3
-Requires: gnome-python-desktop >= %{gnome_python_desktop}
-Requires: pygtkglext PyOpenGL
 Requires: gnuchess
 Requires: gnuchess
 Requires: hicolor-icon-theme
 Requires: hicolor-icon-theme
-Requires: gnome-python-rsvg
 
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: pygtk2-devel
-BuildRequires: pygtkglext-devel
-BuildRequires: gnome-python-desktop >= %{gnome_python_desktop}
+BuildRequires: pygobject3-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: scrollkeeper
 BuildRequires: librsvg2-devel
 BuildRequires: librsvg2-devel
-BuildRequires: guile-devel >= 1.6.5
-BuildRequires: expat-devel
-BuildRequires: gstreamer-devel >= %{gstreamer_version}
 BuildRequires: clutter-devel, clutter-gtk-devel
 BuildRequires: clutter-devel, clutter-gtk-devel
-BuildRequires: libSM-devel
-BuildRequires: check-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: sqlite3-devel
 BuildRequires: sqlite3-devel
 BuildRequires: mesa-libGLU-devel
 BuildRequires: mesa-libGLU-devel
-BuildRequires: docbook-style-xsl
 
 
-# Newer than internal gettext needed
-BuildRequires: gettext
-# Needed by intltool
-BuildRequires: perl(XML::Parser)
 BuildRequires: autoconf >= 2.60
 BuildRequires: autoconf >= 2.60
-BuildRequires: gnome-doc-utils >= 0.3.2
-BuildRequires: itstool
+BuildRequires: yelp-tools
 
 
 
 
 Provides: gnome-sudoku
 Provides: gnome-sudoku
@@ -101,11 +81,8 @@ autoconf
 export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL"
 export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL"
 # swell-foop, lightsoff: remove (vine6)
 # swell-foop, lightsoff: remove (vine6)
 %configure \
 %configure \
-	--with-gtk=3.0 \
-	--with-sound=gstreamer \
 	--localstatedir=/var/lib \
 	--localstatedir=/var/lib \
-	--enable-games="quadrapassel,gnect,gnomine,mahjongg,gtali,gnotravex,gnotski,glines,iagno,glchess,gnobots2,gnibbles,gnome-sudoku" \
-	--disable-gnuchess
+	--enable-games="quadrapassel,gnect,gnomine,gnome-mahjongg,gtali,gnotravex,gnotski,glines,iagno,glchess,gnobots2,gnibbles,gnome-sudoku" 
 make 
 make 
 
 
 # strip unneeded translations from .mo files
 # strip unneeded translations from .mo files
@@ -134,7 +111,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 ## things we just don't want in the package
 ## things we just don't want in the package
 
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
 
 
 ## install desktop files
 ## install desktop files
 desktop-file-install --vendor gnome --delete-original       \
 desktop-file-install --vendor gnome --delete-original       \
@@ -157,16 +133,17 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 fi
 
 
-
 %postun
 %postun
 touch %{_datadir}/icons/hicolor
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 fi
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null || :
 
 
 %posttrans 
 %posttrans 
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null || :
 
 
 
 
 
 
@@ -187,16 +164,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/gtali
 %{_datadir}/gtali
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/iagno
 %{_datadir}/iagno
-%{_datadir}/mahjongg
+%{_datadir}/gnome-mahjongg
 %{_datadir}/quadrapassel
 %{_datadir}/quadrapassel
 %{_mandir}/man6/*
 %{_mandir}/man6/*
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
 
-%{_libdir}/gnome-games
-#%{_libdir}/girepository-1.0/GnomeGamesSupport-1.0.typelib
-#%{_datadir}/gir-1.0/GnomeGamesSupport-1.0.gir
-
 #%{python_sitelib}/glchess
 #%{python_sitelib}/glchess
 %{python_sitelib}/gnome_sudoku
 %{python_sitelib}/gnome_sudoku
 
 
@@ -209,7 +182,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 # these are setgid games
 # these are setgid games
 %attr(2551, root, games) %{_bindir}/gnomine
 %attr(2551, root, games) %{_bindir}/gnomine
-%attr(2551, root, games) %{_bindir}/mahjongg
+%attr(2551, root, games) %{_bindir}/gnome-mahjongg
 %attr(2551, root, games) %{_bindir}/gtali
 %attr(2551, root, games) %{_bindir}/gtali
 %attr(2551, root, games) %{_bindir}/gnobots2
 %attr(2551, root, games) %{_bindir}/gnobots2
 %attr(2551, root, games) %{_bindir}/quadrapassel
 %attr(2551, root, games) %{_bindir}/quadrapassel
@@ -223,6 +196,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0.2-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+- remove old required packages
+
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
g/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-vl.spec

@@ -1,8 +1,8 @@
 Summary: Symbolic GNOME icons
 Summary: Symbolic GNOME icons
 Name: gnome-icon-theme-symbolic
 Name: gnome-icon-theme-symbolic
-Version: 3.4.0
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Source0: http://download.gnome.org/sources/gnome-icon-theme-symbolic/3.4/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-icon-theme-symbolic/3.6/%{name}-%{version}.tar.xz
 License: CC-BY-SA
 License: CC-BY-SA
 BuildArch: noarch
 BuildArch: noarch
 Group: User Interface/Desktops
 Group: User Interface/Desktops
@@ -45,6 +45,9 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 %{_datadir}/icons/gnome/*
 %{_datadir}/icons/gnome/*
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
g/gnome-icon-theme/gnome-icon-theme-vl.spec

@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Summary: Base gnome icons
 Summary(ja): 基本 GNOME アイコン
 Summary(ja): 基本 GNOME アイコン
 Name: gnome-icon-theme
 Name: gnome-icon-theme
-Version: 3.4.0
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.6/%{name}-%{version}.tar.xz
 #Source10: %{name}-ja.po
 #Source10: %{name}-ja.po
 License: GPL
 License: GPL
 BuildArch: noarch
 BuildArch: noarch
@@ -58,6 +58,9 @@ fi
 %{_datadir}/pkgconfig/*.pc
 %{_datadir}/pkgconfig/*.pc
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 
 

+ 7 - 6
g/gnome-keyring/gnome-keyring-vl.spec

@@ -1,19 +1,17 @@
-%define gtk3_version 3.4.1
+%define gtk3_version 3.6.0
 
 
 Summary: A framework for managing user passwords and other secrets
 Summary: A framework for managing user passwords and other secrets
 Summary(ja): ユーザのパスワードや秘匿情報を管理するためのフレームワーク
 Summary(ja): ユーザのパスワードや秘匿情報を管理するためのフレームワーク
 Name: gnome-keyring
 Name: gnome-keyring
-Version: 3.4.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPL/LGPL
 License: GPL/LGPL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 URL: http://www.gnome.org
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk3 >= %{gtk3_version}
 Requires: gtk3 >= %{gtk3_version}
-Requires(post,pre,preun): GConf2
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: GConf2-devel >= 1.0
 BuildRequires: dbus-devel >= 1.0
 BuildRequires: dbus-devel >= 1.0
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: libcap-ng-devel
 BuildRequires: libcap-ng-devel
@@ -110,7 +108,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-gpg.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-gpg.desktop
-%{_sysconfdir}/pkcs11/modules/gnome-keyring-module
+%{_sysconfdir}/pkcs11/modules/gnome-keyring.module
 %{_bindir}/*
 %{_bindir}/*
 %dir %{_libdir}/gnome-keyring
 %dir %{_libdir}/gnome-keyring
 %{_libdir}/gnome-keyring/devel/*.so
 %{_libdir}/gnome-keyring/devel/*.so
@@ -125,6 +123,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 
 
 %changelog
 %changelog
+* Fri Sep 28 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 - remove BuildRequires: p11-kit-devel
 - remove BuildRequires: p11-kit-devel

+ 12 - 5
g/gnome-menus/gnome-menus-vl.spec

@@ -3,12 +3,12 @@
 Summary:  A menu system for the GNOME project
 Summary:  A menu system for the GNOME project
 Summary(ja): GNOMEプロジェクト用メニューシステム
 Summary(ja): GNOMEプロジェクト用メニューシステム
 Name: gnome-menus
 Name: gnome-menus
-Version: 3.4.2
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: LGPL
 License: LGPL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, glib2-devel
 BuildRequires: python-devel, glib2-devel
@@ -66,7 +66,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null || :
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+
 
 
 
 
 %files -f %{po_package}-3.0.lang
 %files -f %{po_package}-3.0.lang
@@ -80,7 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gmenu-simple-editor
 %{_bindir}/gmenu-simple-editor
 %{python_sitearch}/GMenuSimpleEditor/*
 %{python_sitearch}/GMenuSimpleEditor/*
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/girepository-1.0/*.typelib
-#{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
 %{_datadir}/gnome-menus
 %{_datadir}/gnome-menus
 %{_datadir}/applications/gmenu-simple-editor.desktop
 %{_datadir}/applications/gmenu-simple-editor.desktop
 
 
@@ -90,9 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/gnome-menus-3.0
 %{_includedir}/gnome-menus-3.0
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gir-1.0/*.gir
-#{_bindir}/gnome-menu-spec-test
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 9 - 3
g/gnome-online-accounts/gnome-online-accounts-vl.spec

@@ -1,4 +1,4 @@
-%define         package_version 3.4.2
+%define         package_version 3.6.0
 %define         package_release 1%{?_dist_release}
 %define         package_release 1%{?_dist_release}
 
 
 Name:           gnome-online-accounts
 Name:           gnome-online-accounts
@@ -9,7 +9,7 @@ Summary:        GNOME applications and libraries to access the user's online acc
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
 URL:            http://www.clutter-project.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
@@ -18,7 +18,8 @@ BuildRequires:	gobject-introspection-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	WebKit3-gtk-devel
 BuildRequires:	WebKit3-gtk-devel
 BuildRequires:	json-glib-devel
 BuildRequires:	json-glib-devel
-BuildRequires:	libgnome-keyring-devel
+BuildRequires:	gcr-devel
+BuildRequires:	libsecret-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	rest-devel
 BuildRequires:	rest-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gtk-doc
@@ -116,6 +117,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- remove BuildRequires: libgnome-keyring-devel
+- add BuildRequires: gcr-devel, libsecret-devel
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 8 - 5
g/gnome-packagekit/gnome-packagekit-vl.spec

@@ -1,8 +1,8 @@
 Summary:	A PackageKit client for the GNOME desktop
 Summary:	A PackageKit client for the GNOME desktop
 Name:		gnome-packagekit
 Name:		gnome-packagekit
-Version:	3.2.1
-Release:	2%{?_dist_release}
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.xz
+Version:	3.6.0
+Release:	1%{?_dist_release}
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 License:	GPLv2
 Group:		Applications/Administration
 Group:		Applications/Administration
 URL:		http://www.packagekit.org
 URL:		http://www.packagekit.org
@@ -16,7 +16,7 @@ BuildRequires:	libgudev1-devel
 BuildRequires:	upower-devel
 BuildRequires:	upower-devel
 BuildRequires:	libcanberra-gtk3-devel
 BuildRequires:	libcanberra-gtk3-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	libnotify-devel
-BuildRequires:	gnome-doc-utils
+BuildRequires:	yelp-tools
 
 
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
@@ -92,7 +92,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/gpk-service-pack
 %{_bindir}/gpk-service-pack
 %{_bindir}/gpk-update-viewer
 %{_bindir}/gpk-update-viewer
 %{python_sitelib}/packagekit
 %{python_sitelib}/packagekit
-%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/gpk-pk-gtk-module.desktop
 %{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
 %{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
@@ -103,6 +102,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.1-2
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.1-2
 - rebuild with python-2.7.2
 - rebuild with python-2.7.2
 
 

+ 18 - 67
g/gnome-panel/gnome-panel-vl.spec

@@ -2,9 +2,9 @@
 
 
 %define gettext_package gnome-panel-2.0
 %define gettext_package gnome-panel-2.0
 
 
-%define gnome_desktop3_version 3.4.1
-%define glib2_version 2.32.1
-%define gtk3_version 3.4.1
+%define gnome_desktop3_version 3.6.0
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
 %define libgnome_version 2.32.0
 %define libgnome_version 2.32.0
 %define orbit_version 2.14.19
 %define orbit_version 2.14.19
 %define libwnck3_version 3.0.0
 %define libwnck3_version 3.0.0
@@ -14,7 +14,6 @@
 %define cairo_version 1.10.0
 %define cairo_version 1.10.0
 %define dbus_version 1.4.0
 %define dbus_version 1.4.0
 %define dbus_glib_version 0.88
 %define dbus_glib_version 0.88
-%define gnome_doc_utils_version 0.3.2
 %define libgweather_version 2.30.3
 %define libgweather_version 2.30.3
 %define libcanberra_version 0.25
 %define libcanberra_version 0.25
 %define gobject_introspection_version 0.9.8
 %define gobject_introspection_version 0.9.8
@@ -22,22 +21,19 @@
 Summary: GNOME panel
 Summary: GNOME panel
 Summary(ja): GNOME パネル
 Summary(ja): GNOME パネル
 Name: gnome-panel
 Name: gnome-panel
-Version: 3.4.2.1
+Version: 3.6.0
 Release: 1%{_dist_release}
 Release: 1%{_dist_release}
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
 License: GPL 
 License: GPL 
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 
 
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
 # Remove this line and next line when upstream adopt Source1
 # Remove this line and next line when upstream adopt Source1
-Source1: clock.gnome-2-32.ja.po
 Source2: vine6-panel-default-setup.entries
 Source2: vine6-panel-default-setup.entries
 Source5: vine-panel-backwards-compat-config.schemas
 Source5: vine-panel-backwards-compat-config.schemas
 Source10: add-translations.sh
 Source10: add-translations.sh
 Source12: gnome-compiler-flags.m4
 Source12: gnome-compiler-flags.m4
 
 
-Patch0: gnome-panel-3.0.2-configure.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
@@ -45,8 +41,7 @@ Requires: gnome-desktop3 >= %{gnome_desktop3_version}
 Requires: libwnck3 >= %{libwnck3_version}
 Requires: libwnck3 >= %{libwnck3_version}
 Requires: gnome-menus >= %{gnome_menus_version}
 Requires: gnome-menus >= %{gnome_menus_version}
 Requires: vine-menus >= 1.1
 Requires: vine-menus >= 1.1
-Requires(post,postun): scrollkeeper, gtk3
-Requires(post,pre,preun): GConf2
+Requires(post,postun): gtk3
 
 
 %if %{use_eds}
 %if %{use_eds}
 Requires: evolution-data-server >= 2.30.2
 Requires: evolution-data-server >= 2.30.2
@@ -59,16 +54,14 @@ BuildRequires: gettext
 BuildRequires: automake
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: libtool
-BuildRequires: scrollkeeper
 BuildRequires: libxslt
 BuildRequires: libxslt
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libwnck3-devel >= %{libwnck3_version}
 BuildRequires: libwnck3-devel >= %{libwnck3_version}
-BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: yelp-tools
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: gtk-doc
 BuildRequires: gtk-doc
 BuildRequires: pango-devel
 BuildRequires: pango-devel
@@ -121,7 +114,6 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: pkgconfig
 Requires: pkgconfig
 Requires: glib2-devel >= %{glib2_version}
 Requires: glib2-devel >= %{glib2_version}
 Requires: gtk3-devel >= %{gtk3_version}
 Requires: gtk3-devel >= %{gtk3_version}
-Requires: GConf2-devel >= %{gconf_version}
 
 
 %description devel
 %description devel
 Header files and libraries for building a panel applets of GNOME.
 Header files and libraries for building a panel applets of GNOME.
@@ -132,10 +124,6 @@ GNOME のパネルアップレットをビルドするためのヘッダファ
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
-
-# Remove this line and next line when upstream adopt Source1
-#cp -f %{SOURCE1} help/clock/ja/ja.po
 
 
 cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE12} m4
 cp -f %{SOURCE12} m4
@@ -149,7 +137,7 @@ cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 #automake --add-missing
 #automake --add-missing
 #autoheader
 #autoheader
 #autoconf
 #autoconf
-%configure --disable-scrollkeeper \
+%configure \
            --disable-schemas-install \
            --disable-schemas-install \
            --disable-gtk-doc \
            --disable-gtk-doc \
            --with-in-process-applets=clock:fish \
            --with-in-process-applets=clock:fish \
@@ -165,9 +153,7 @@ make
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 #
 #
 # Create pager and tasklist schemas for compatibility with older
 # Create pager and tasklist schemas for compatibility with older
@@ -177,9 +163,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 #sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
 #sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
 
 
 
 
-## blow away stuff we don't want
-/bin/rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-#rmdir --ignore-fail-on-non-empty $RPM_BUILD_ROOT/var
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 
 
 /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
@@ -197,58 +180,22 @@ desktop-file-install --delete-original \
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
+/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 fi
 
 
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
-#
-# Clear out the old defaults
-#
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel > /dev/null || :
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel > /dev/null || :
-
-# install schemas
-SCHEMAS="clock.schemas"
-for S in $SCHEMAS; do
-    echo %{_sysconfdir}/gconf/schemas/$S ; done \
-    | xargs gconftool-2 --makefile-install-rule >& /dev/null 2>&1 ||:
-
-#
-# Install the default setup into /apps/panel and /apps/panel/default_setup
-#
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/clock.schemas > /dev/null 2>&1 || :
-
-/sbin/ldconfig
-scrollkeeper-update > /dev/null 2>&1 || :
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="clock.schemas"
-  for S in $SCHEMAS; do
-      echo %{_sysconfdir}/gconf/schemas/$S ; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null 2>&1 ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="clock.schemas"
-  for S in $SCHEMAS; do
-      echo %{_sysconfdir}/gconf/schemas/$S ; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null 2>&1 ||:
-fi
-
 %postun
 %postun
 /sbin/ldconfig
 /sbin/ldconfig
-scrollkeeper-update > /dev/null 2>&1 || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 fi
+update-desktop-database -q &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
   
   
 %files -f %{gettext_package}.lang
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -256,7 +203,6 @@ fi
 %{_bindir}/*
 %{_bindir}/*
 %exclude %{_bindir}/panel-test-applets
 %exclude %{_bindir}/panel-test-applets
 %{_libexecdir}/*
 %{_libexecdir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
@@ -281,6 +227,11 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- remove Patch0 (gnome-panel-3.5.91-configure.patch)
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.1-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.1-1
 - new upstream release
 - new upstream release
 
 

+ 13 - 39
g/gnome-power-manager/gnome-power-manager-vl.spec

@@ -1,36 +1,32 @@
-%define dbus_version 1.4.16
-%define dbus_glib_version 0.96
-%define gnome_panel_version 3.4.0
+%define dbus_version 1.6.4
+%define dbus_glib_version 0.100
+%define gnome_panel_version 3.6.0
 
 
 Summary: GNOME power management service
 Summary: GNOME power management service
 Summary(ja): GNOME 電源管理ツール
 Summary(ja): GNOME 電源管理ツール
 Name: gnome-power-manager
 Name: gnome-power-manager
-Version: 3.4.0
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL
 License: GPLv2+ and GFDL
 Group: Applications/System
 Group: Applications/System
 URL: http://projects.gnome.org/gnome-power-manager/
 URL: http://projects.gnome.org/gnome-power-manager/
 
 
-Source0: http://download.gnome.org/sources/gnome-power-manager/3.4/gnome-power-manager-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-power-manager/3.6/gnome-power-manager-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf >= 2.65
 BuildRequires: autoconf >= 2.65
 BuildRequires: gtk3-devel
 BuildRequires: gtk3-devel
-BuildRequires: libgnomeui-devel
-BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: libwnck-devel
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: libnotify-devel
 BuildRequires: libnotify-devel
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
-BuildRequires: scrollkeeper
-BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: yelp-tools
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: cairo-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libcanberra-gtk3-devel
 BuildRequires: unique3-devel >= 3.0.0
 BuildRequires: unique3-devel >= 3.0.0
-## BuildRequires: DeviceKit-power-devel >= 008
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: control-center-devel
 BuildRequires: control-center-devel
 BuildRequires: intltool
 BuildRequires: intltool
@@ -44,8 +40,6 @@ Requires: dbus-x11 >= %{dbus_version}
 Requires: libcanberra-gtk3 >= 0.10
 Requires: libcanberra-gtk3 >= 0.10
 Requires: unique3 >= 3.0.0
 Requires: unique3 >= 3.0.0
 Requires: upower >= 0.9.0
 Requires: upower >= 0.9.0
-Requires(post,postun): scrollkeeper
-Requires(post,pre,preun): GConf2
 
 
 Obsoletes: gnome-power-manager-extra < 3.0.0
 Obsoletes: gnome-power-manager-extra < 3.0.0
 Provides:  gnome-power-manager-extra
 Provides:  gnome-power-manager-extra
@@ -66,49 +60,25 @@ change preferences.
 
 
 %build
 %build
 %configure \
 %configure \
-	--disable-scrollkeeper 
+	--disable-static
 make
 make
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-#desktop-file-install --vendor gnome --delete-original                   \
-#  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart         		\
-#  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
-
-# save space by linking identical images in translated docs
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
-  b="$(basename $f)"
-  for d in $helpdir/*; do
-    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-      g="$d/figures/$b"
-      if [ -f "$g" ]; then
-        if cmp -s $f $g; then
-          rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi
-      fi
-    fi
-  done
-done
-
-%find_lang %name --with-gnome
+
+%find_lang %name --all-name --with-gnome
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
-scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 fi
 
 
 %postun
 %postun
-scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
@@ -130,6 +100,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_mandir}/man1/gnome-power-statistics.1.gz
 %{_mandir}/man1/gnome-power-statistics.1.gz
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gome-doc-utils
+
 * Sun Apr 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 * Sun Apr 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-1
 - new upstream release
 - new upstream release
 
 

+ 8 - 5
g/gnome-screensaver/gnome-screensaver-vl.spec

@@ -1,6 +1,6 @@
-%define _dbus_ver		1.4.20
-%define _gtk_ver		3.4.0
-%define _glib_ver		2.32.0
+%define _dbus_ver		1.6.4
+%define _gtk_ver		3.6.0
+%define _glib_ver		2.34.0
 %define _libgnomekbd_ver	3.4.0
 %define _libgnomekbd_ver	3.4.0
 %define _libglade_ver		2.6.0
 %define _libglade_ver		2.6.0
 %define _libgnome_menu_ver	3.2.0
 %define _libgnome_menu_ver	3.2.0
@@ -12,13 +12,13 @@
 Summary:	GNOME Screensaver
 Summary:	GNOME Screensaver
 Summary(ja):	GNOME スクリーンセーバー
 Summary(ja):	GNOME スクリーンセーバー
 Name:		gnome-screensaver
 Name:		gnome-screensaver
-Version:	3.4.4
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	GPL
 License:	GPL
 Group:		User Interface/Desktops
 Group:		User Interface/Desktops
 URL:		http://live.gnome.org/GnomeScreensaver/
 URL:		http://live.gnome.org/GnomeScreensaver/
 
 
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/3.4/gnome-screensaver-%{version}.tar.xz
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/3.6/gnome-screensaver-%{version}.tar.xz
 Source1: gnome-screensaver-hide-xscreensaver.menu
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 
 Vendor:		Project Vine
 Vendor:		Project Vine
@@ -104,6 +104,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_mandir}/man1/*.1*
 %{_mandir}/man1/*.1*
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
 - new upstream release
 - new upstream release
 
 

+ 10 - 3
g/gnome-screenshot/gnome-screenshot-vl.spec

@@ -1,19 +1,22 @@
 Summary:	GNOME screenshot utility
 Summary:	GNOME screenshot utility
 Summary(ja):	GNOMEスクリーンショットユーティリティ
 Summary(ja):	GNOMEスクリーンショットユーティリティ
 Name:		gnome-screenshot
 Name:		gnome-screenshot
-Version:	3.4.1
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 License:	GPLv2+
 License:	GPLv2+
 Group:		Applications/System
 Group:		Applications/System
 URL:		http://www.gnome.org
 URL:		http://www.gnome.org
 
 
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	libcanberra-gtk3-devel
 BuildRequires:	libcanberra-gtk3-devel
 
 
+Requires(postun,posttrans):	glib2
+Requires(postun,posttrans):	desktop-file-utils
+
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 Packager:	Takemikaduchi
 Packager:	Takemikaduchi
@@ -49,9 +52,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %postun
 /sbin/ldconfig
 /sbin/ldconfig
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
 
 
 %posttrans
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
 
 
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
@@ -60,10 +65,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/GConf/gsettings/gnome-screenshot.convert
 %{_datadir}/GConf/gsettings/gnome-screenshot.convert
 %{_datadir}/applications/gnome-screenshot.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
-%{_datadir}/%{name}/gnome-screenshot.ui
 %{_mandir}/man1/gnome-screenshot.1.gz
 %{_mandir}/man1/gnome-screenshot.1.gz
 
 
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - initial build for Vine Linux
 - initial build for Vine Linux

+ 100 - 0
g/gnome-search-tool/gnome-search-tool-vl.spec

@@ -0,0 +1,100 @@
+Summary:	GNOME search tool
+Summary(ja):	GNOME 検索ツール
+Name:		gnome-search-tool
+Version:	3.6.0
+Release:	1%{?_dist_release}
+License:	GPLv2+
+Group:		User Interface/Desktops
+URL:		http://www.gnome.org
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gtk3-devel
+BuildRequires:	libSM-devel
+BuildRequires:	itstool
+
+Requires(postun,posttrans):	glib2
+Requires(postun,posttrans):	desktop-file-utils
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+
+%description
+gnome-search-tool is a utility for finding files on your system. To perform a
+basic search, you can type a filename or a partial filename,
+with or without wildcards. To refine your search, you can
+apply additional search options.
+
+%description -l ja
+gnome-search-tool はシステム内のファイルを検索するユーティリティーです。
+基本的な検索を行うには、ファイル名かファイル名の一部をワイルドカードあり
+またはなしでタイプします。詳細検索を行うには、追加検索オプションを適用します。
+
+
+%package        devel
+Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発ファイル
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       gobject-introspection-devel
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%package        doc
+Summary:        Documentation for %{name}
+Summary(ja):    %{name} 用のドキュメント
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+This package contains documentation for %{name}.
+
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name} --all-name --with-gnome
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_datadir}/GConf/gsettings/gnome-search-tool.convert
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-search-tool.gschema.xml
+%{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
+%{_mandir}/man1/%{name}.1.gz
+
+
+%changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- initial build

+ 18 - 18
g/gnome-session/gnome-session-vl.spec

@@ -1,34 +1,34 @@
-%define glib2_version 2.32.1
-%define pango_version 1.30.0
-%define gtk3_version 3.4.1
-%define gconf2_version 2.32.2
-%define dbus_glib_version 0.88
-%define dbus_version 1.4.0
-%define libnotify_version 0.4.5
+%define glib2_version 2.34.0
+%define pango_version 1.32.0
+%define gtk3_version 3.6.0
+%define dbus_glib_version 0.100
+%define dbus_version 1.6.4
+%define libnotify_version 0.7
 
 
 %define po_package gnome-session-3.0
 %define po_package gnome-session-3.0
 
 
 Summary: GNOME session manager
 Summary: GNOME session manager
 Summary(ja): GNOME セッションマネージャ
 Summary(ja): GNOME セッションマネージャ
 Name: gnome-session
 Name: gnome-session
-Version: 3.4.2.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org/
 URL: http://www.gnome.org/
 License: GPLv2+ 
 License: GPLv2+ 
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.6/%{name}-%{version}.tar.xz
 Source1: vine-default-session
 Source1: vine-default-session
 Source2: gnome.desktop 
 Source2: gnome.desktop 
-Source3: gnome-session.gnome-2-32.ja.po
+
+Patch0:	gnome-session-3.6.0-hardware-compatibility.patch
 
 
 # fixed upstream
 # fixed upstream
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: pangox-compat-devel
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
@@ -42,9 +42,6 @@ BuildRequires: upower-devel
 BuildRequires: json-glib-devel
 BuildRequires: json-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
 
 
-Requires(post): GConf2 >= %{gconf2_version}
-Requires(pre): GConf2 >= %{gconf2_version}
-Requires(preun): GConf2 >= %{gconf2_version}
 Conflicts: gdm < 2.4.0.7
 Conflicts: gdm < 2.4.0.7
 Requires: vine-backgrounds >= 3.8
 Requires: vine-backgrounds >= 3.8
 Requires: control-center
 Requires: control-center
@@ -61,7 +58,7 @@ GNOME components and handles logout and saving the session.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-#cp %{SOURCE3} po/ja.po
+%patch0 -p1
 
 
 %build
 %build
 #sed -i -e 's/GNOME_COMPILE_WARNINGS.*//' configure.in
 #sed -i -e 's/GNOME_COMPILE_WARNINGS.*//' configure.in
@@ -83,9 +80,7 @@ make %{?_smp_mflags}
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 desktop-file-install --vendor gnome --delete-original                   \
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
@@ -129,7 +124,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files -f %{po_package}.lang
 %files -f %{po_package}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc AUTHORS COPYING ChangeLog NEWS README
-#doc %{_docdir}/%{name}/dbus/gnome-session.html
 %{_sysconfdir}/xdg/autostart
 %{_sysconfdir}/xdg/autostart
 %{_bindir}/*
 %{_bindir}/*
 %{_libexecdir}/gnome-session-check-accelerated
 %{_libexecdir}/gnome-session-check-accelerated
@@ -148,6 +142,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- remove BuildRequires: GConf2-devel
+- add BuildRequires: pangox-compat-devel
+- add Patch0 (gnome-session-3.6.0-hardware-compatibility.patch)
+
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.1-1
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2.1-1
 - new upstream release
 - new upstream release
 - add BuildRequires: xorg-x11-xtrans-devel
 - add BuildRequires: xorg-x11-xtrans-devel

+ 15 - 4
g/gnome-settings-daemon/gnome-settings-daemon-vl.spec

@@ -2,13 +2,15 @@ Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 Summary(ja):	GNOME から GTK+/KDE のアプリケーションで設定を共有するためのデーモン
 Summary(ja):	GNOME から GTK+/KDE のアプリケーションで設定を共有するためのデーモン
 
 
 Name:		gnome-settings-daemon
 Name:		gnome-settings-daemon
-Version:	3.4.2
+Version:	3.6.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 
 
 Group:		System Environment/Daemons
 Group:		System Environment/Daemons
 License:	GPLv2+
 License:	GPLv2+
 URL:		http://ftp.gnome.org/pub/gnome/sources/%{name}
 URL:		http://ftp.gnome.org/pub/gnome/sources/%{name}
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+
+Patch0:		gnome-settings-daemon-3.6.0-disable-packagekit.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
@@ -39,6 +41,7 @@ BuildRequires:	lcms2-devel
 BuildRequires:	libwacom-devel
 BuildRequires:	libwacom-devel
 BuildRequires:	xorg-x11-drv-wacom-devel
 BuildRequires:	xorg-x11-drv-wacom-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	libXtst-devel
+BuildRequires:	ibus-devel
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -61,12 +64,15 @@ developing applications that use %{name}.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
+%patch0 -p1 -b .packagekit
 
 
 %build
 %build
+autoreconf -if
 %configure \
 %configure \
 	--disable-static \
 	--disable-static \
 	--disable-profiling \
 	--disable-profiling \
-	--disable-packagekit
+	--disable-packagekit \
+	--enable-ibus
 	
 	
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
@@ -116,7 +122,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/gnome-settings-daemon-3.0
 %{_libdir}/gnome-settings-daemon-3.0
 %{_libexecdir}/*
 %{_libexecdir}/*
 %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
 %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
-%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
+%{_datadir}/dbus-1/services/org.freedesktop.IBus.service
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/gnome-settings-daemon/
 %{_datadir}/gnome-settings-daemon/
 %{_datadir}/gnome-settings-daemon-3.0/
 %{_datadir}/gnome-settings-daemon-3.0/
@@ -131,6 +137,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: ibus-devel
+- add Patch0 (gnome-settings-daemon-3.6.0-disable-packagekit.patch)
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 15 - 7
g/gnome-shell-extensions/gnome-shell-extensions-vl.spec

@@ -1,6 +1,6 @@
 Name:           gnome-shell-extensions
 Name:           gnome-shell-extensions
-Version:        3.4.0
-Release:        2%{?_dist_release}
+Version:        3.5.91
+Release:        1%{?_dist_release}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Group:          User Interface/Desktops
 Group:          User Interface/Desktops
 License:        GPLv2+ 
 License:        GPLv2+ 
@@ -8,8 +8,6 @@ URL:            http://live.gnome.org/GnomeShell/Extensions
 
 
 Source0:        gnome-shell-extensions-%{version}.tar.xz
 Source0:        gnome-shell-extensions-%{version}.tar.xz
 
 
-Patch0:		gnome-shell-extensions-3.4.0-git20120430.patch
-
 BuildRequires:  gnome-common
 BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  intltool
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
@@ -187,10 +185,9 @@ An message tray indicator showing CPU and memory loads.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
 
 
-# make g-s-e work with g-s 3.1.91.1
-#sed -i "s|3.1.91|3.2.0|g" configure.ac
+# make g-s-e work with g-s 3.6.x
+sed -i "s|3.5.91|3.6|g" configure.ac
 
 
 %build
 %build
 # since we build from a git checkout
 # since we build from a git checkout
@@ -232,6 +229,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %files alternative-status-menu
 %files alternative-status-menu
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.alternative-status-menu.gschema.xml
 %{_datadir}/gnome-shell/extensions/alternative-status-menu*
 %{_datadir}/gnome-shell/extensions/alternative-status-menu*
 
 
 %files dock
 %files dock
@@ -296,6 +294,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 %posttrans alternate-tab
 %posttrans alternate-tab
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 
+%posttrans alternative-status-menu
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
 %posttrans dock
 %posttrans dock
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 
@@ -311,6 +312,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %postun alternate-tab
 %postun alternate-tab
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
+%postun alternative-status-menu
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 %postun dock
 %postun dock
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
@@ -322,6 +326,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Mon Oct 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.91-1
+- new upstream release
+- remove Patch0 (gnome-shell-extensions-3.4.0-git20120430.patch)
+
 * Wed May 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-2
 * Wed May 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0-2
 - add Patch0 (gnome-shell-extensions-3.4.0-git20120430.patch)
 - add Patch0 (gnome-shell-extensions-3.4.0-git20120430.patch)
 
 

+ 14 - 6
g/gnome-shell/gnome-shell-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 3.4.2
+%define pkg_version 3.6.0
 %define pkg_release 1%{?_dist_release}
 %define pkg_release 1%{?_dist_release}
 
 
 Summary:     Window management and application launching for GNOME
 Summary:     Window management and application launching for GNOME
@@ -17,7 +17,7 @@ URL:         http://live.gnome.org/GnomeShell
 Requires(post,postun): scrollkeeper >= 0.1.4
 Requires(post,postun): scrollkeeper >= 0.1.4
 Requires: mutter
 Requires: mutter
 Requires: caribou
 Requires: caribou
-Requires: openssl
+Requires: ca-certificates
 Requires: at-spi2-atk
 Requires: at-spi2-atk
 
 
 BuildRequires: gnome-common
 BuildRequires: gnome-common
@@ -50,7 +50,8 @@ BuildRequires: evolution-data-server-devel
 BuildRequires: folks-devel
 BuildRequires: folks-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: libgudev1-devel
 BuildRequires: libgudev1-devel
-BuildRequires: openssl
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: ca-certificates
 BuildRequires: intltool
 BuildRequires: intltool
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -76,8 +77,7 @@ and easy to use experience.
 libtoolize --copy --force
 libtoolize --copy --force
 autoreconf
 autoreconf
 %configure \
 %configure \
-	--disable-static \
-	--with-ca-certificates=%{_datadir}/ssl/certs/ca-bundle.crt
+	--disable-static 
 
 
 %{__make} %{?_smp_mflags} 
 %{__make} %{?_smp_mflags} 
 
 
@@ -121,6 +121,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/gnome-shell
 %{_bindir}/gnome-shell
 %{_bindir}/gnome-shell-extension-tool
 %{_bindir}/gnome-shell-extension-tool
 %{_bindir}/gnome-shell-extension-prefs
 %{_bindir}/gnome-shell-extension-prefs
+%{_bindir}/gnome-shell-perf-tool
 %{_libdir}/gnome-shell/*
 %{_libdir}/gnome-shell/*
 %{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.so
 %{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.so
 %{_libexecdir}/gnome-shell-calendar-server
 %{_libexecdir}/gnome-shell-calendar-server
@@ -129,10 +130,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/GConf/gsettings/gnome-shell-overrides.convert
 %{_datadir}/GConf/gsettings/gnome-shell-overrides.convert
 %{_datadir}/applications/gnome-shell.desktop
 %{_datadir}/applications/gnome-shell.desktop
 %{_datadir}/applications/gnome-shell-extension-prefs.desktop
 %{_datadir}/applications/gnome-shell-extension-prefs.desktop
+%{_datadir}/applications/evolution-calendar.desktop
 %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.evolution.calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/gnome-shell/*
 %{_datadir}/gnome-shell/*
 %{_datadir}/gtk-doc/html/shell
 %{_datadir}/gtk-doc/html/shell
@@ -141,6 +142,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add Patch0 (gnome-shell-3.5.92-git20120921.patch)
+- update Patch101 (gnome-shell-vine-settings.patch)
+- change BuildRequires: ca-certificates instead of openssl
+- add BuildRequires: libcanberra-gtl3-devel
+
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun Jul 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 - remove Patch103 (gnome-shell-ja.po-date.patch)
 - remove Patch103 (gnome-shell-ja.po-date.patch)

+ 75 - 0
g/gnome-system-log/gnome-system-log-vl.spec

@@ -0,0 +1,75 @@
+Summary:	GNOME logfile viewer
+Summary(ja):	GNOME ログビューアー
+Name:		gnome-system-log
+Version:	3.6.0
+Release:	1%{?_dist_release}
+License:	GPLv2+
+Group:		User Interface/Desktops
+URL:		http://www.gnome.org
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gtk3-devel
+BuildRequires:	itstool
+
+Requires(postun,posttrans):	glib2
+Requires(postun,posttrans):	desktop-file-utils
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+
+%description
+gnome-system-log is a simple utility to display system log files.
+
+%description -l ja
+gnome-system-log はシステムログファイルを閲覧するためのシンプルなユーティリティーです。
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name} --all-name --with-gnome
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+update-desktop-database -q &> /dev/null ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_datadir}/GConf/gsettings/logview.convert
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-log.gschema.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/%{name}.1.gz
+
+
+%changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- initial build

+ 10 - 6
g/gnome-system-monitor/gnome-system-monitor-vl.spec

@@ -1,9 +1,9 @@
 # Note that this is NOT a relocatable package
 # Note that this is NOT a relocatable package
 
 
-%define glib2_version 2.32.0
+%define glib2_version 2.34.0
 %define libwnck3_version 3.0.0
 %define libwnck3_version 3.0.0
 %define libgtop2_version 2.28.2
 %define libgtop2_version 2.28.2
-%define gtk3_version 3.4.0
+%define gtk3_version 3.6.0
 %define gnome_icon_theme_version 3.4.0
 %define gnome_icon_theme_version 3.4.0
 %define glibmm_version 2.22.0
 %define glibmm_version 2.22.0
 %define gtkmm3_version 3.0.0
 %define gtkmm3_version 3.0.0
@@ -14,12 +14,12 @@
 Summary: Gnome system monitor
 Summary: Gnome system monitor
 Summary(ja): GNOMEシステムモニタ
 Summary(ja): GNOMEシステムモニタ
 Name: gnome-system-monitor
 Name: gnome-system-monitor
-Version: 3.4.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPL
 License: GPL
 
 
 Group: Applications/System
 Group: Applications/System
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post,postun): scrollkeeper
 Requires(post,postun): scrollkeeper
@@ -35,7 +35,7 @@ BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: librsvg2-devel >= %{librsvg2_version}
 BuildRequires: librsvg2-devel >= %{librsvg2_version}
 BuildRequires: dbus-glib-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: yelp-tools
 Obsoletes: gtop
 Obsoletes: gtop
 
 
 Vendor: Project Vine
 Vendor: Project Vine
@@ -92,10 +92,14 @@ fi
 %{_bindir}/gnome-system-monitor
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/%{name}/preferences.ui
+%{_datadir}/%{name}/*.ui
 %{_datadir}/pixmaps/gnome-system-monitor
 %{_datadir}/pixmaps/gnome-system-monitor
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gnome-doc-utils
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1-1
 - new upstream release
 - new upstream release
 
 

+ 12 - 9
g/gnome-terminal/gnome-terminal-vl.spec

@@ -1,19 +1,19 @@
 %define gettext_package gnome-terminal
 %define gettext_package gnome-terminal
 
 
-%define glib2_version 2.32.0
-%define gtk3_version 3.4.0
+%define glib2_version 2.34.0
+%define gtk3_version 3.6.0
 %define gconf2_version 3.2.0
 %define gconf2_version 3.2.0
-%define vte_version 0.32.0
+%define vte_version 0.34.0
 %define startup_notification_version 0.8
 %define startup_notification_version 0.8
 %define desktop_file_utils_version 0.10
 %define desktop_file_utils_version 0.10
 
 
 Summary: GNOME Terminal
 Summary: GNOME Terminal
 Summary(ja): GNOME ターミナル
 Summary(ja): GNOME ターミナル
 Name: gnome-terminal
 Name: gnome-terminal
-Version: 3.4.1.1
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org
 URL: http://www.gnome.org
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.4/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.6/%{name}-%{version}.tar.xz
 Patch10: %{name}-2.22.0-i18n-help.patch
 Patch10: %{name}-2.22.0-i18n-help.patch
 
 
 License: GPL 
 License: GPL 
@@ -32,9 +32,10 @@ BuildRequires: dbus-glib-devel
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
-BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: docbook-utils
 BuildRequires: docbook-utils
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: gnome-doc-utils
+BuildRequires: itstool
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -72,7 +73,7 @@ desktop-file-install --vendor gnome --delete-original       \
   --add-only-show-in GNOME                                  \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 
-%find_lang %{gettext_package}
+%find_lang %{gettext_package} --all-name --with-gnome
 
 
 # remove unpackaged files
 # remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
@@ -103,11 +104,13 @@ fi
 %{_bindir}/*
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-terminal
 %{_datadir}/gnome-terminal
-%{_datadir}/gnome
-%{_datadir}/omf
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 
 %changelog
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- add BuildRequires: itstool
+
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1.1-1
 * Sun Apr 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.1.1-1
 - new upstream release
 - new upstream release
 
 

+ 7 - 8
g/gnome-themes-standard/gnome-themes-standard-vl.spec

@@ -1,12 +1,12 @@
 Name: gnome-themes-standard
 Name: gnome-themes-standard
-Version: 3.4.2
+Version: 3.6.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Summary: Standard themes for GNOME applications
 Summary: Standard themes for GNOME applications
 
 
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 License: LGPLv2+
 License: LGPLv2+
 URL: http://git.gnome.org/browse/gnome-themes-standard
 URL: http://git.gnome.org/browse/gnome-themes-standard
-Source0: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 
 BuildRequires: gtk3-devel >= 3.0.2
 BuildRequires: gtk3-devel >= 3.0.2
 BuildRequires: librsvg2-devel
 BuildRequires: librsvg2-devel
@@ -40,14 +40,14 @@ touch --no-create %{_datadir}/icons/Adwaita &>/dev/null || :
 
 
 %postun
 %postun
 if [ $1 -eq 0 ] ; then
 if [ $1 -eq 0 ] ; then
-    for t in  Adwaita HighContrast HighContrastInverse LowContrast; do
+    for t in  Adwaita HighContrast; do
         touch --no-create %{_datadir}/icons/$t &>/dev/null
         touch --no-create %{_datadir}/icons/$t &>/dev/null
         gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
         gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
     done
     done
 fi
 fi
 
 
 %posttrans
 %posttrans
-for t in  Adwaita HighContrast HighContrastInverse LowContrast; do
+for t in  Adwaita HighContrast; do
   gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
 done
 done
 
 
@@ -64,18 +64,17 @@ done
 %{_datadir}/gnome-background-properties/*
 %{_datadir}/gnome-background-properties/*
 
 
 # A11y themes
 # A11y themes
-%{_datadir}/icons/LowContrast
-%{_datadir}/themes/LowContrast
 %{_datadir}/icons/HighContrast
 %{_datadir}/icons/HighContrast
 %{_datadir}/themes/HighContrast
 %{_datadir}/themes/HighContrast
-%{_datadir}/icons/HighContrastInverse
-%{_datadir}/themes/HighContrastInverse
 
 
 # Cursors
 # Cursors
 %{_datadir}/icons/Adwaita
 %{_datadir}/icons/Adwaita
 
 
 
 
 %changelog
 %changelog
+* Thu Sep 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 68 - 0
g/gnome-themes-vine/gnome-themes-vine-vl.spec

@@ -0,0 +1,68 @@
+Summary: Vine themes for GNOME
+Summary(ja): GNOME 用 Vine テーマ
+Name: gnome-themes-vine
+Version: 3.6.0
+Release: 1%{?_dist_release}
+License: GPLv2
+Group: User Interface/Desktops
+
+Source0: metatheme-vine-7.tar.xz
+Source1: icon-theme-vine-6.tar.bz2
+Source2: cursor-theme-vine-7.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-root
+BuildArch: noarch
+
+Requires(post): gtk3 >= 3.0.0
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+%description
+Contains the vine themes for Gnome desktop environment.
+
+%description -l ja
+このパッケージにはGNOMEデスクトップ環境用 Vine テーマが含まれます。 
+
+%prep
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mkdir $RPM_BUILD_ROOT%{_datadir}/themes
+mkdir $RPM_BUILD_ROOT%{_datadir}/icons
+
+# install Vine
+tar xJvf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/themes
+tar xzvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/icons
+tar xJvf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/icons
+
+# remove audio, battery icons
+for file in `find $RPM_BUILD_ROOT%{_datadir}/icons/Vine/ | egrep "audio|battery"`; do 
+	rm -f $file
+done
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+if [ -f /usr/bin/gtk-update-icon-cache ]; then
+  for dir in /usr/share/icons/*; do
+    if [ -d "$dir" -a -f "$dir/index.theme" ]; then
+        /usr/bin/gtk-update-icon-cache --quiet $dir ||:
+    fi
+  done
+fi
+
+
+%files
+%defattr(-,root,root)
+%{_datadir}/icons/*
+%{_datadir}/themes/*
+
+%changelog
+* Sat Oct 06 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- divide package from gnome-themes

+ 7 - 16
g/gnome-themes/gnome-themes-vl.spec

@@ -2,15 +2,12 @@ Summary: GNOME Themes collection
 Summary(ja): GNOME テーマコレクション
 Summary(ja): GNOME テーマコレクション
 Name: gnome-themes
 Name: gnome-themes
 Version: 3.0.0
 Version: 3.0.0
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 License: GPL/LGPL/CC
 License: GPL/LGPL/CC
 Group: User Interface/Desktops
 Group: User Interface/Desktops
 
 
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/3.0/%{name}-%{version}.tar.bz2
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/3.0/%{name}-%{version}.tar.bz2
-Source10: metatheme-vine-7.tar.xz
-Source11: icon-theme-vine-6.tar.bz2
-Source12: cursor-theme-vine-7.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 BuildArch: noarch
@@ -23,7 +20,6 @@ BuildRequires: pkgconfig
 Requires: gtk3-engines >= 2.91
 Requires: gtk3-engines >= 2.91
 Requires: metacity >= 2.20.3-3vl6
 Requires: metacity >= 2.20.3-3vl6
 Requires: gtk-xfce-engine >= 2.2
 Requires: gtk-xfce-engine >= 2.2
-Requires: gnome-themes-standard
 
 
 Conflicts: gnome-themes-extras < 0.8
 Conflicts: gnome-themes-extras < 0.8
 
 
@@ -36,8 +32,7 @@ Distribution: Vine Linux
 Contains the base themes for Gnome desktop environment.
 Contains the base themes for Gnome desktop environment.
 
 
 %description -l ja
 %description -l ja
-このパッケージにはGNOMEデスクトップ環境のための基本テーマと
-Vine Linux 標準の Vine テーマが含まれています。
+このパッケージにはGNOMEデスクトップ環境のための基本テーマが含まれています。
 
 
 %prep
 %prep
 %setup -q
 %setup -q
@@ -50,11 +45,6 @@ Vine Linux 標準の Vine テーマが含まれています。
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-# install Vine
-tar xJvf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/themes
-tar xzvf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/icons
-tar xJvf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/icons
-
 #remove unneeded files
 #remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/engines/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/engines/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ThinIce/{README.html,ICON.png}
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ThinIce/{README.html,ICON.png}
@@ -65,10 +55,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/HighContrastInverse/index.theme
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/HighContrast/index.theme
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/HighContrast/index.theme
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/HighContrastInverse/index.theme
 rm -f $RPM_BUILD_ROOT%{_datadir}/themes/HighContrastInverse/index.theme
 
 
-# remove audio, battery icons
-for file in `find $RPM_BUILD_ROOT%{_datadir}/icons/Vine/ | egrep "audio|battery"`; do 
-	rm -f $file
-done
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +77,11 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/*
 %{_datadir}/locale/*/LC_MESSAGES/*
 
 
 %changelog
 %changelog
+* Tue Oct 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-7
+- remove Source10 (metatheme-vine-7.tar.xz)
+- remove Source11 (icon-theme-vine-6.tar.bz2)
+- remove Source12 (cursor-theme-vine-7.tar.xz)
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-6
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-6
 - update Source10 (metatheme-vine-7.tar.xz)
 - update Source10 (metatheme-vine-7.tar.xz)
 - update Source12 (cursor-theme-vine-7.tar.xz)
 - update Source12 (cursor-theme-vine-7.tar.xz)

+ 20 - 2
g/gnome-tweak-tool/gnome-tweak-tool-vl.spec

@@ -1,11 +1,11 @@
 Name:           gnome-tweak-tool
 Name:           gnome-tweak-tool
-Version:        3.4.0.1
+Version:        3.5.5
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A tool to customize advanced GNOME 3 options
 Summary:        A tool to customize advanced GNOME 3 options
 
 
 License:        GPLv3
 License:        GPLv3
 URL:            http://live.gnome.org/GnomeTweakTool
 URL:            http://live.gnome.org/GnomeTweakTool
-Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/3.5/%{name}-%{version}.tar.xz
 
 
 Patch101:	gnome-tweak-tool-vine-customize.patch
 Patch101:	gnome-tweak-tool-vine-customize.patch
 
 
@@ -59,6 +59,19 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %find_lang %{name}
 %find_lang %{name}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_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 || :
+fi
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %doc AUTHORS COPYING NEWS README
 %doc AUTHORS COPYING NEWS README
@@ -66,9 +79,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %{python_sitelib}/gtweak
 %{python_sitelib}/gtweak
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/icons/hicolor/*/*/*
 
 
 
 
 %changelog
 %changelog
+* Tue Oct 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.5-1
+- new upstream release
+- update Patch101
+
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0.1-1
 * Sun May 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.0.1-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 3
g/gnome-user-docs/gnome-user-docs-vl.spec

@@ -1,10 +1,10 @@
 Summary:        GNOME User Documentation
 Summary:        GNOME User Documentation
 Summary(ja):    GNOME ユーザドキュメント
 Summary(ja):    GNOME ユーザドキュメント
 Name:           gnome-user-docs
 Name:           gnome-user-docs
-Version:        3.4.2
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 License:        FDL
 License:        FDL
-Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 Group:          Applications/Documentation
 Group:          Applications/Documentation
 
 
 BuildArch:      noarch
 BuildArch:      noarch
@@ -13,7 +13,6 @@ BuildRequires:  gnome-doc-utils
 BuildRequires:  gettext, pkgconfig
 BuildRequires:  gettext, pkgconfig
 BuildRequires:  docbook-dtds
 BuildRequires:  docbook-dtds
 BuildRequires:  which
 BuildRequires:  which
-BuildRequires:  itstool
 BuildRequires:  yelp-tools
 BuildRequires:  yelp-tools
 Obsoletes:      gnome-users-guide
 Obsoletes:      gnome-users-guide
 Requires(post,postun): scrollkeeper >= 0.3.10
 Requires(post,postun): scrollkeeper >= 0.3.10
@@ -88,6 +87,9 @@ exit 0
 
 
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 * Tue Jun 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - new upstream release
 
 

+ 15 - 23
g/gnome-user-share/gnome-user-share-vl.spec

@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Summary: Gnome user file sharing
 Summary(ja): Gnome ユーザファイル共有
 Summary(ja): Gnome ユーザファイル共有
 Name: gnome-user-share
 Name: gnome-user-share
-Version: 3.0.2
+Version: 3.0.4
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPL
 License: GPL
 Group: System Environment/Libraries
 Group: System Environment/Libraries
@@ -11,7 +11,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/3.0/%{name}-%{v
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: httpd >= 2.2.0
 Requires: gnome-bluetooth-libs >= 2.28.0
 Requires: gnome-bluetooth-libs >= 2.28.0
-BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
+BuildRequires: avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: httpd >= 2.2.0
 BuildRequires: httpd >= 2.2.0
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: libglade2-devel >= 2.0.0
@@ -24,8 +24,7 @@ BuildRequires: gnome-bluetooth-devel >= 2.32.0
 BuildRequires: unique3-devel
 BuildRequires: unique3-devel
 BuildRequires: nautilus-devel
 BuildRequires: nautilus-devel
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
-BuildRequires: gnome-doc-utils
-Requires(post,pre,preun): GConf2
+BuildRequires: yelp-tools
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -45,9 +44,7 @@ masses.
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %__make install DESTDIR=$RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
 
 
@@ -56,26 +53,18 @@ desktop-file-install --vendor gnome --delete-original                   \
   --add-only-show-in GNOME                                              \
   --add-only-show-in GNOME                                              \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 
-%find_lang %{name}
+%find_lang %{name} --all-name --with-gnome
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
-fi
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
-fi
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -83,15 +72,18 @@ fi
 %{_bindir}/*
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libexecdir}/*
 %{_libdir}/nautilus/extensions-3.0/*.so
 %{_libdir}/nautilus/extensions-3.0/*.so
+%{_datadir}/GConf/gsettings/gnome-user-share.convert
 %{_datadir}/applications/*
 %{_datadir}/applications/*
+%{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml
 %{_datadir}/gnome-user-share
 %{_datadir}/gnome-user-share
-%{_datadir}/gnome/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/omf/*
-%{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 
 
 %changelog
 %changelog
+* Sun Sep 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.4-1
+- new upstream release
+- change BuildRequires: yelp-tools instead of gome-doc-utils
+
 * Sun Apr 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
 * Sun Apr 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
 - new upstream release
 - new upstream release
 
 

Some files were not shown because too many files changed in this diff