Browse Source

X.Org, compiz, GNOME3, etc...

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4616 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 12 years ago
parent
commit
8e59a0338c
100 changed files with 4003 additions and 1899 deletions
  1. 10 4
      C/ConsoleKit/ConsoleKit-vl.spec
  2. 18 15
      G/GConf2/GConf2-vl.spec
  3. 6 5
      M/ModemManager/ModemManager-vl.spec
  4. 7 3
      N/NetworkManager-openconnect/NetworkManager-openconnect-vl.spec
  5. 8 4
      N/NetworkManager-openvpn/NetworkManager-openvpn-vl.spec
  6. 12 4
      N/NetworkManager-pptp/NetworkManager-pptp-vl.spec
  7. 8 4
      N/NetworkManager-vpnc/NetworkManager-vpnc-vl.spec
  8. 34 21
      N/NetworkManager/NetworkManager-vl.spec
  9. 44 30
      W/WebKit/WebKit-vl.spec
  10. 197 0
      W/WebKit3/WebKit3-vl.spec
  11. 7 6
      a/accerciser/accerciser-vl.spec
  12. 134 0
      a/accountsservice/accountsservice-vl.spec
  13. 12 15
      a/anjuta-extras/anjuta-extras-vl.spec
  14. 60 53
      a/anjuta/anjuta-vl.spec
  15. 155 0
      a/apg/apg-vl.spec
  16. 10 3
      a/atk/atk-vl.spec
  17. 4 1
      a/atkmm/atkmm-vl.spec
  18. 44 33
      a/avahi/avahi-vl.spec
  19. 31 17
      b/brasero/brasero-vl.spec
  20. 8 1
      b/bug-buddy/bug-buddy-vl.spec
  21. 7 1
      c/cairomm/cairomm-vl.spec
  22. 36 28
      c/cheese/cheese-vl.spec
  23. 89 0
      c/clutter-gesture/clutter-gesture-vl.spec
  24. 19 13
      c/clutter-gst/clutter-gst-vl.spec
  25. 22 15
      c/clutter-gtk/clutter-gtk-vl.spec
  26. 129 0
      c/clutter-imcontext/clutter-imcontext-vl.spec
  27. 22 15
      c/clutter/clutter-vl.spec
  28. 106 0
      c/cogl/cogl-vl.spec
  29. 150 0
      c/colord/colord-vl.spec
  30. 8 2
      c/compiz-bcop/compiz-bcop-vl.spec
  31. 11 6
      c/compiz-plugins-extra/compiz-plugins-extra-vl.spec
  32. 11 3
      c/compiz-plugins/compiz-plugins-vl.spec
  33. 46 24
      c/compiz/compiz-vl.spec
  34. 7 1
      c/compizconfig-backend-gconf/compizconfig-backend-gconf-vl.spec
  35. 74 200
      c/control-center/control-center-vl.spec
  36. 7 1
      d/dbus-glib/dbus-glib-vl.spec
  37. 21 4
      d/dbus/dbus-vl.spec
  38. 27 10
      d/dconf/dconf-vl.spec
  39. 9 2
      d/desktop-file-utils/desktop-file-utils-vl.spec
  40. 12 20
      d/devhelp/devhelp-vl.spec
  41. 24 6
      e/ekiga/ekiga-vl.spec
  42. 6 1
      e/emerald/emerald-vl.spec
  43. 25 9
      e/empathy/empathy-vl.spec
  44. 21 7
      e/eog-plugins/eog-plugins-vl.spec
  45. 36 44
      e/eog/eog-vl.spec
  46. 41 34
      e/epiphany/epiphany-vl.spec
  47. 14 10
      e/evince/evince-vl.spec
  48. 47 79
      e/evolution-data-server/evolution-data-server-vl.spec
  49. 87 31
      e/evolution/evolution-vl.spec
  50. 16 7
      f/farsight2/farsight2-vl.spec
  51. 27 41
      f/file-roller/file-roller-vl.spec
  52. 18 9
      f/firefox/firefox-vl.spec
  53. 15 4
      f/folks/folks-vl.spec
  54. 9 7
      g/gcalctool/gcalctool-vl.spec
  55. 12 4
      g/gconf-editor/gconf-editor-vl.spec
  56. 9 2
      g/gdk-pixbuf2/gdk-pixbuf2-vl.spec
  57. 16 10
      g/gdl/gdl-vl.spec
  58. 274 200
      g/gdm/gdm-vl.spec
  59. 20 28
      g/gedit-plugins/gedit-plugins-vl.spec
  60. 47 45
      g/gedit/gedit-vl.spec
  61. 14 1
      g/geoclue/geoclue-vl.spec
  62. 9 3
      g/gjs/gjs-vl.spec
  63. 31 25
      g/glade3/glade3-vl.spec
  64. 65 0
      g/glib-networking/glib-networking-vl.spec
  65. 24 9
      g/glib2/glib2-vl.spec
  66. 8 3
      g/glibmm/glibmm-vl.spec
  67. 9 2
      g/gmime/gmime-vl.spec
  68. 22 11
      g/gnome-applets/gnome-applets-vl.spec
  69. 9 3
      g/gnome-backgrounds/gnome-backgrounds-vl.spec
  70. 15 55
      g/gnome-bluetooth/gnome-bluetooth-vl.spec
  71. 49 42
      g/gnome-color-manager/gnome-color-manager-vl.spec
  72. 36 29
      g/gnome-desktop-sharp2/gnome-desktop-sharp2-vl.spec
  73. 11 8
      g/gnome-desktop/gnome-desktop-vl.spec
  74. 117 0
      g/gnome-desktop3/gnome-desktop3-vl.spec
  75. 9 2
      g/gnome-devel-docs/gnome-devel-docs-vl.spec
  76. 20 8
      g/gnome-disk-utility/gnome-disk-utility-vl.spec
  77. 8 1
      g/gnome-doc-utils/gnome-doc-utils-vl.spec
  78. 5 2
      g/gnome-games-extra-data/gnome-games-extra-data-vl.spec
  79. 32 53
      g/gnome-games/gnome-games-vl.spec
  80. 88 0
      g/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-vl.spec
  81. 10 3
      g/gnome-icon-theme/gnome-icon-theme-vl.spec
  82. 43 28
      g/gnome-keyring/gnome-keyring-vl.spec
  83. 8 2
      g/gnome-menus/gnome-menus-vl.spec
  84. 17 5
      g/gnome-nettool/gnome-nettool-vl.spec
  85. 120 0
      g/gnome-online-accounts/gnome-online-accounts-vl.spec
  86. 47 76
      g/gnome-panel/gnome-panel-vl.spec
  87. 48 74
      g/gnome-power-manager/gnome-power-manager-vl.spec
  88. 21 37
      g/gnome-screensaver/gnome-screensaver-vl.spec
  89. 31 25
      g/gnome-session/gnome-session-vl.spec
  90. 47 86
      g/gnome-settings-daemon/gnome-settings-daemon-vl.spec
  91. 265 0
      g/gnome-shell-extensions/gnome-shell-extensions-vl.spec
  92. 50 17
      g/gnome-shell/gnome-shell-vl.spec
  93. 22 24
      g/gnome-system-monitor/gnome-system-monitor-vl.spec
  94. 25 10
      g/gnome-terminal/gnome-terminal-vl.spec
  95. 82 0
      g/gnome-themes-standard/gnome-themes-standard-vl.spec
  96. 27 11
      g/gnome-themes/gnome-themes-vl.spec
  97. 114 0
      g/gnome-tweak-tool/gnome-tweak-tool-vl.spec
  98. 14 14
      g/gnome-user-docs/gnome-user-docs-vl.spec
  99. 19 8
      g/gnome-user-share/gnome-user-share-vl.spec
  100. 26 80
      g/gnome-utils/gnome-utils-vl.spec

+ 10 - 4
C/ConsoleKit/ConsoleKit-vl.spec

@@ -1,12 +1,12 @@
 %define glib2_version           2.26.0
-%define dbus_version            1.4
-%define dbus_glib_version       0.88
-%define polkit_version          0.99
+%define dbus_version            1.4.14
+%define dbus_glib_version       0.94
+%define polkit_version          0.101
 
 Summary: System daemon for tracking users, sessions and seats
 Summary(ja): ユーザ、セッションおよび座席を捕捉するシステムデーモン
 Name: ConsoleKit
-Version: 0.4.3
+Version: 0.4.5
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -26,6 +26,9 @@ BuildRequires: xmlto
 Requires: dbus
 Requires: dbus-glib
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -177,6 +180,9 @@ fi
 
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.5-1
+- new upstream release
+
 * Thu Dec 30 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.3-1
 - new upstream release
 

+ 18 - 15
G/GConf2/GConf2-vl.spec

@@ -9,11 +9,11 @@
 Summary: A process-transparent configuration system
 Summary(ja): プロセス透過型設定システム
 Name: GConf2
-Version: 2.32.1
-Release: 2%{?_dist_release}
+Version: 3.1.4
+Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Base
-Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/3.1/GConf-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
 BuildRequires: libxml2-devel >= %{libxml2_version}
@@ -21,7 +21,7 @@ BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 BuildRequires: openldap-devel
 BuildRequires: gtk-doc >= 0.9
 BuildRequires: polkit-devel >= 0.99
@@ -31,13 +31,12 @@ Requires: dbus
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
-#
-Patch2: GConf-2.28.0-no-access-crash.patch
-# upstream fix
-Patch3: 0001-Make-the-defaults-mechanism-find-the-right-polkit-ac.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=608705
-Patch4: 0001-gconfd-Remove-worse-than-useless-signal-handlers-for.patch
 
+Patch2: GConf2-3.1.4-gsettings-data-convert.patch
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 
 %description
@@ -80,7 +79,7 @@ The GConf2-gtk package contains graphical GConf utilities
 which require GTK+.
 
 %description -l ja gtk
-GConf2-gtk パッケージには gtk2 を利用したグラフィカルな GConf
+GConf2-gtk パッケージには gtk3 を利用したグラフィカルな GConf
 ユーティリティが含まれています。
 
 
@@ -127,12 +126,10 @@ GConf 開発パッケージです。GConf を使って開発するために必
 
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
-## %patch2 -p1 -b .no-access
-## %patch3 -p1 -b .defaults-actions
-## %patch4 -p1 -b .segv
+%patch2 -p1 -b .gdc
 
 %build
-%configure --disable-gtk-doc --disable-static --enable-defaults-service --with-gtk=2.0
+%configure --disable-gtk-doc --disable-static --enable-defaults-service --with-gtk=3.0
 %__make %{?_smp_mflags}
 
 %install
@@ -220,6 +217,12 @@ fi
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change configure option (from --with-gtk=2.0 to --with-gtk=3.0)
+- replace Patch2 (GConf2-3.1.4-gsettings-data-convert.patch)
+- delete Patch3,4
+
 * Thu Mar 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.1-2
 - add gtk subpackage to include gconf-sanity-check-2
 - add --with-gtk=2.0

+ 6 - 5
M/ModemManager/ModemManager-vl.spec

@@ -5,8 +5,8 @@
 Summary: Mobile broadband modem management service
 Summary(ja): Mobile broadband modem management service
 Name: ModemManager
-Version: 0.4
-Release: 2%{?snapshot}%{?_dist_release}
+Version: 0.4.998
+Release: 1%{?snapshot}%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -17,9 +17,8 @@ URL: http://www.gnome.org/projects/NetworkManager/
 #    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 #    make distcheck
 #
-Source: %{name}-%{version}%{?snapshot}.tar.bz2
+Source: %{name}-%{version}%{?snapshot}.tar.xz
 Patch1: %{name}-0.3-jp-modems.patch
-Patch20: %{name}-0.4-git20110428.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: dbus-glib
@@ -41,7 +40,6 @@ modems, including mobile broadband (3G) devices.
 %prep
 %setup -q
 %patch1 -p1 -b .jp-modems
-%patch20 -p1 -b .git20110428
 
 %build
 autoreconf -i
@@ -96,6 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/icons/hicolor/22x22/apps/modem-manager.png
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.998-1
+- delete Patch20
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4-2
 - update Patch20 (ModemManager-0.4-git20110428.patch)
 - delete Patch21,22

+ 7 - 3
N/NetworkManager-openconnect/NetworkManager-openconnect-vl.spec

@@ -1,6 +1,6 @@
 %define nm_version          0.8.4.0
 %define dbus_version        1.4.1
-%define gtk2_version        2.22.1
+%define gtk3_version        3.0.0
 %define openconnect_version 3.02
 
 %define svn_snapshot        %{nil}
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Summary(ja): NetworkManager の openconnect 用 VPN 統合
 Name:      NetworkManager-openconnect
-Version:   0.8.4
+Version:   0.8.999
 Release:   1%{svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -23,7 +23,7 @@ Source:    %{name}-%{version}%{svn_snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: autoconf
-BuildRequires: gtk2-devel             >= %{gtk2_version}
+BuildRequires: gtk3-devel             >= %{gtk3_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
@@ -110,6 +110,10 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.999-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 - add BuildRequires: openconnect-devel

+ 8 - 4
N/NetworkManager-openvpn/NetworkManager-openvpn-vl.spec

@@ -1,6 +1,6 @@
 %define nm_version          0.8.4.0-1
 %define dbus_version        1.4
-%define gtk2_version        2.22.1
+%define gtk3_version        3.0.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
@@ -9,7 +9,7 @@
 Summary: NetworkManager VPN plugin for OpenVPN
 Summary(ja): OpenVPN を使った NetworkManager 用 VPN プラグイン
 Name: NetworkManager-openvpn
-Version: 0.8.4
+Version: 0.8.9997
 Release: 1%{?svn_snapshot}%{?_dist_release}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -22,7 +22,7 @@ Group: System Environment/Base
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}%{?svn_snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel                 >= %{gtk2_version}
+BuildRequires: gtk3-devel                 >= %{gtk3_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
 BuildRequires: NetworkManager-devel       >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
@@ -40,7 +40,7 @@ Requires(post): %{_bindir}/update-desktop-database
 Requires(postun): %{_bindir}/update-desktop-database
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: gtk2             >= %{gtk2_version}
+Requires: gtk3             >= %{gtk3_version}
 Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: openvpn          >= %{openvpn_version}
@@ -115,6 +115,10 @@ fi
 
 
 %changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.9997-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 

+ 12 - 4
N/NetworkManager-pptp/NetworkManager-pptp-vl.spec

@@ -1,6 +1,6 @@
 %define nm_version          0.8.4.0
 %define dbus_version        1.4
-%define gtk2_version        2.22.1
+%define gtk3_version        3.0.0
 %define ppp_version         2.4.5
 %define shared_mime_version 0.16
 
@@ -8,18 +8,20 @@
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
-Version:   0.8.4
+Version:   0.8.999
 Release:   1%{?svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 
 Source:    %{name}-%{version}%{?svn_snapshot}.tar.bz2
+
+Patch0:	   %{name}-0.8.999-gtk_box.patch
 Patch10:   %{name}-0.7.1-dbus-permission.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: gtk2-devel             >= %{gtk2_version}
+BuildRequires: gtk3-devel             >= %{gtk3_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
@@ -29,7 +31,7 @@ BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 BuildRequires: ppp-devel >= %{ppp_version}
 
-Requires: gtk2             >= %{gtk2_version}
+Requires: gtk3             >= %{gtk3_version}
 Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: ppp              >= %{ppp_version}
@@ -50,6 +52,7 @@ the NetworkManager and the GNOME desktop.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch10 -p1
 
 %build
@@ -110,6 +113,11 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.999-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- add Patch0 (NetworkManager-pptp-0.8.999-gtk_box.patch)
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 

+ 8 - 4
N/NetworkManager-vpnc/NetworkManager-vpnc-vl.spec

@@ -1,6 +1,6 @@
 %define nm_version          0.8.4.0
 %define dbus_version        1.4
-%define gtk2_version        2.22.1
+%define gtk3_version        3.0.0
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
@@ -9,7 +9,7 @@
 Summary:   NetworkManager VPN plugin for vpnc
 Summary(ja): NetworkManager の vpnc 用 VPN プラグイン
 Name:      NetworkManager-vpnc
-Version:   0.8.4
+Version:   0.8.999
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -17,7 +17,7 @@ URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{svn_snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: gtk2-devel             >= %{gtk2_version}
+BuildRequires: gtk3-devel             >= %{gtk3_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
@@ -92,12 +92,16 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_libexecdir}/nm-vpnc-service
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
+%{_datadir}/applications/nm-vpnc-auth-dialog.desktop
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
-#%{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.999-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Wed May 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 

+ 34 - 21
N/NetworkManager/NetworkManager-vl.spec

@@ -3,12 +3,12 @@
 %define dbus_version 1.4.1
 %define dbus_glib_version 0.92
 
-%define gtk2_version	2.22.1
+%define gtk3_version	3.0.11
 %define wireless_tools_version 29
 %define libnl_version 1.1
-%define ppp_version 2.4.4
+%define ppp_version 2.4.5
 
-%define applet_version 0.8.4
+%define applet_version 0.8.9997
 
 #define snapshot .git20090414
 #define applet_snapshot %{nil}
@@ -16,19 +16,19 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 0.8.4.0
-Release: 2%{?snapshot}%{?_dist_release}
+Version: 0.8.9997
+Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}%{?snapshot}.tar.bz2
-Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.bz2
+Source: %{name}-%{version}%{?snapshot}.tar.xz
+Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.xz
 Source2: nm-system-settings.conf
-Patch1:  nm-applet-internal-buildfixes-nm084.patch
+Patch1:  nm-applet-internal-buildfixes-nm089997.patch
 Patch2:  explain-dns1-dns2.patch
-Patch20: NetworkManager-0.8.4.0-git20110501.patch
-Patch30: network-manager-applet-0.8.4-git20110503.patch
+#Patch20: NetworkManager-0.8.4.0-git20110501.patch
+#Patch30: network-manager-applet-0.8.4-git20110503.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -53,7 +53,7 @@ Conflicts: %{name}-openvpn < 0.7.0.99
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
-BuildRequires: glib2-devel gtk2-devel
+BuildRequires: glib2-devel gtk3-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
 BuildRequires: GConf2-devel
@@ -76,6 +76,9 @@ BuildRequires: gnome-bluetooth-devel
 BuildRequires: libgudev1-devel
 BuildRequires: iptables-devel
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 NetworkManager attempts to keep an active network connection available at all
 times.  It is intended only for the desktop use-case, and is not intended for
@@ -109,7 +112,7 @@ Requires: gnome-panel
 Requires: dbus
 Requires: dbus-glib
 Requires: libnotify
-Requires(post):  gtk2 >= %{gtk2_version}
+Requires(post):  gtk3 >= %{gtk3_version}
 Requires: gnome-keyring
 Requires: nss
 Requires: gnome-icon-theme
@@ -150,17 +153,17 @@ NetworkManager functionality from applications that use glib.
 %setup -q
 
 # unpack the applet
-tar -xzf %{SOURCE1}
+xz -dc %{SOURCE1} | tar xf -
 %patch1 -p1 -b .nm-applet-internal
-%patch2 -p1 -b .explain-dns1-dns2
-%patch20 -p1 -b .NM-git20110501
-pushd network-manager-applet-%{applet_version}
-%patch30 -p1 -b .nma-git20110501
-popd
+#%patch2 -p1 -b .explain-dns1-dns2
+#%patch20 -p1 -b .NM-git20110501
+#pushd network-manager-applet-%{applet_version}
+#%patch30 -p1 -b .nma-git20110501
+#popd
 
 
 %build
-autoreconf -i
+# autoreconf -if
 %configure \
 	--disable-static \
 	--with-distro=redhat \
@@ -273,8 +276,8 @@ fi
 %defattr(-,root,root,0755)
 %doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
-%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
+%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
 %{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
@@ -291,6 +294,7 @@ fi
 %{_libexecdir}/nm-dispatcher.action
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
+%{_libdir}/girepository-1.0/*.typelib
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -312,10 +316,12 @@ fi
 %{_includedir}/%{name}/NetworkManagerVPN.h
 %{_includedir}/NetworkManager/nm-version.h
 %{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gtk-doc/html/NetworkManager/*
 
 %files gnome
 %defattr(-,root,root,0755)
-%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
+#%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_sysconfdir}/gconf/schemas/nm-applet.schemas
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
@@ -353,6 +359,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.9997-1
+- update to 0.8.9997
+- update Patch1 (nm-applet-internal-buildfixes-nm089997.patch)
+- delete Patch20,30
+- drop Patch2
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Fri Jun 03 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.4.0-2
 - move nm-version.h to -devel from -glib-devel
 

+ 44 - 30
W/WebKit/WebKit-vl.spec

@@ -15,7 +15,7 @@
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.2.7
+Version:	1.5.1
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -30,8 +30,6 @@ Packager: yasumichi
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-Patch0:		WebKit-1.2.5-gir.patch
-
 # upstream patch
 Patch100:	WebKit-icu44-36381.patch
 
@@ -109,13 +107,13 @@ AUTHORS files.
 
 %prep
 %setup -q -n webkit-%{version}
-%patch0 -p1 -b .gir_vine
 
 # upstream
 ## %patch100 -p0
 
 %build
 %configure \
+--with-gtk=2.0 \
 --enable-icon-database \
 --enable-geolocation \
 --enable-introspection=yes \
@@ -126,8 +124,8 @@ make %{?_smp_mflags}
 
 # workaround for bug 488112
 # Compile libJavaScriptCore.a with -fno-strict-aliasing
-touch JavaScriptCore/AllInOneFile.cpp
-make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing"
+##touch JavaScriptCore/AllInOneFile.cpp
+##make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 
 %install
@@ -137,23 +135,21 @@ make install DESTDIR=%{buildroot}
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
 install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 
-## Finally, copy over and rename the various files for %%doc inclusion.
-rm -f docfiles.list
-%add_to_doc_files JavaScriptCore/COPYING.LIB
-%add_to_doc_files JavaScriptCore/icu/LICENSE
-%add_to_doc_files WebKit/LICENSE
-%add_to_doc_files WebCore/LICENSE-APPLE
-%add_to_doc_files WebCore/LICENSE-LGPL-2
-%add_to_doc_files WebCore/LICENSE-LGPL-2.1
-%add_to_doc_files WebCore/icu/LICENSE
-
-%add_to_doc_files JavaScriptCore/AUTHORS
-%add_to_doc_files JavaScriptCore/pcre/AUTHORS
-
-%add_to_doc_files JavaScriptCore/THANKS
-
-%find_lang webkit
-
+# Finally, copy over and rename the various files for %%doc inclusion.
+%add_to_doc_files Source/WebKit/LICENSE
+%add_to_doc_files Source/WebKit/gtk/po/README
+%add_to_doc_files Source/WebKit/gtk/NEWS
+%add_to_doc_files Source/WebCore/icu/LICENSE
+%add_to_doc_files Source/WebCore/LICENSE-APPLE
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_doc_files Source/JavaScriptCore/COPYING.LIB
+%add_to_doc_files Source/JavaScriptCore/THANKS
+%add_to_doc_files Source/JavaScriptCore/AUTHORS
+%add_to_doc_files Source/JavaScriptCore/icu/README
+%add_to_doc_files Source/JavaScriptCore/icu/LICENSE
+
+%find_lang webkit-2.0
 
 %clean
 rm -rf %{buildroot}
@@ -161,31 +157,49 @@ rm -rf %{buildroot}
 
 %post	gtk -p /sbin/ldconfig
 
-%postun	gtk -p /sbin/ldconfig
+%posttrans gtk
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
+%postun	gtk 
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
 
-%files -f webkit.lang gtk
+
+# %files -f webkit.lang gtk
+%files gtk -f webkit-2.0.lang
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/libwebkit-1.0.so.*
+%{_libdir}/*.so.*
 %{_libexecdir}/WebKit/
-%{_bindir}/jsc
+%{_bindir}/jsc-1
 %{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
+%{_datadir}/webkitgtk-1.0/*
 
 %files	gtk-devel
 %defattr(-,root,root,-)
 %exclude %{_libdir}/*.la
 %{_includedir}/webkit-1.0
-%{_datadir}/webkit-1.0
-%{_libdir}/libwebkit-1.0.so
-%{_libdir}/pkgconfig/webkit-1.0.pc
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/gir-1.0/*.gir
 
 %files	doc -f docfiles.list
 %defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}/
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.5.1-1
+- new upstream release
+
+* Sun Jul 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.4.2-1
+- new upstream release
+- delete Patch0
+- add BuildRequires: gtk-doc
+
 * Sat Apr 08 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.2.7-1
 - new upstream release
 

+ 197 - 0
W/WebKit3/WebKit3-vl.spec

@@ -0,0 +1,197 @@
+%define 	add_to_doc_files()	\
+	mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}; \
+	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
+	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
+
+#define		svn_revision	43436
+
+# --with coverage: Enables compile-time checking of code coverage. (default: no)
+%bcond_with	coverage
+# --with jit: Enable JIT ("just-in-time") JavaScript compiling support.
+#%bcond_with	jit
+# --with pango : use pango for font rendering instead of freetype2 (default: use freetype2)
+%bcond_with	pango
+# --with wml: Build support for WML
+%bcond_with	wml
+
+Name:		WebKit3
+Version:	1.5.1
+Release:        1%{?_dist_release}
+Summary:	Web content engine library
+Summary(ja):	ウェブコンテンツエンジンライブラリ
+
+Group:		Development/Libraries
+License:	LGPLv2+ and BSD
+URL:		http://webkitgtk.org/
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
+
+# upstream patch
+Patch100:	WebKit-icu44-36381.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:	gperf
+BuildRequires:	gtk3-devel
+BuildRequires:	libicu-devel
+BuildRequires:	libjpeg-turbo-devel
+BuildRequires:	libtool
+BuildRequires:	libxslt-devel
+BuildRequires:	libXt-devel
+BuildRequires:	pcre-devel
+BuildRequires:	sqlite3-devel
+BuildRequires:  geoclue-devel
+BuildRequires:  gnome-keyring-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  enchant-devel
+BuildRequires:  gobject-introspection-devel
+
+%if %{with pango}
+BuildRequires:  pango-devel
+%else
+BuildRequires:  cairo-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype2-devel
+%endif
+
+BuildRequires:  libsoup-devel >= 2.28.2
+
+
+%description
+WebKit is an open source web browser engine.
+
+%package	gtk
+Summary:	GTK+ port of WebKit
+Summary(ja):	WebKit の GTK+ ポート
+Group:		Development/Libraries
+
+%description	gtk
+%{name} is an open-source Web content engine library. This package contains
+the shared libraries for the WebKit GTK+ port as well as the sample
+GtkLauncher tool.
+
+
+%package	gtk-devel
+Summary:	Development package for %{name}
+Summary(ja):	%{name} の開発パッケージ
+Group:		Development/Libraries
+Requires:	%{name}-gtk = %{version}-%{release}
+Requires:	pkgconfig
+Requires:	gtk3-devel
+Requires:	libsoup-devel >= 2.28.2
+
+%description	gtk-devel
+The %{name}-gtk-devel package contains libraries, build data, and header
+files for developing applications that use %{name}-gtk.
+Please note that the WebKit/GTK+ API is not yet stable. This should
+only be used as a "preview" rather than a stable platform library.
+
+
+%package	doc
+Summary:	Documentation for %{name}
+Summary(ja):	%{name} のドキュメント
+Group:		Documentation
+
+%description	doc
+%{name} is an open-source Web content engine library. This package contains
+the documentation for %{name}, including various LICENSE, README, and
+AUTHORS files.
+
+
+%prep
+%setup -q -n webkit-%{version}
+
+# upstream
+## %patch100 -p0
+
+%build
+%configure \
+--with-gtk=3.0 \
+--enable-icon-database \
+--enable-geolocation \
+--enable-introspection=yes \
+%{?with_coverage:       --enable-coverage               }       \
+%{?with_pango:          --with-font-backend=pango       }       \
+%{?with_wml:            --enable-wml                    }
+make %{?_smp_mflags}
+
+# workaround for bug 488112
+# Compile libJavaScriptCore.a with -fno-strict-aliasing
+##touch JavaScriptCore/AllInOneFile.cpp
+##make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing"
+
+
+%install
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot}
+install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
+install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+
+# Finally, copy over and rename the various files for %%doc inclusion.
+%add_to_doc_files Source/WebKit/LICENSE
+%add_to_doc_files Source/WebKit/gtk/po/README
+%add_to_doc_files Source/WebKit/gtk/NEWS
+%add_to_doc_files Source/WebCore/icu/LICENSE
+%add_to_doc_files Source/WebCore/LICENSE-APPLE
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_doc_files Source/JavaScriptCore/COPYING.LIB
+%add_to_doc_files Source/JavaScriptCore/THANKS
+%add_to_doc_files Source/JavaScriptCore/AUTHORS
+%add_to_doc_files Source/JavaScriptCore/icu/README
+%add_to_doc_files Source/JavaScriptCore/icu/LICENSE
+
+%find_lang webkit-3.0
+
+%clean
+rm -rf %{buildroot}
+
+
+%post	gtk -p /sbin/ldconfig
+
+%posttrans gtk
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%postun	gtk 
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+
+# %files -f webkit.lang gtk
+%files gtk -f webkit-3.0.lang
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/*.so.*
+%{_libexecdir}/WebKit3/
+%{_bindir}/jsc-3
+%{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml
+%{_datadir}/webkitgtk-3.0/*
+
+%files	gtk-devel
+%defattr(-,root,root,-)
+%exclude %{_libdir}/*.la
+%{_includedir}/webkit-3.0
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+
+%files	doc -f docfiles.list
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}/
+
+
+%changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.5.1-1
+- initial build for Vine Linux
+

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

@@ -1,4 +1,4 @@
-%define pkg_version 1.12.1
+%define pkg_version 3.1.4
 %define pkg_release 1%{?_dist_release}
 
 Summary:	An interactive Python accessibility explorer for the GNOME desktop.
@@ -6,9 +6,9 @@ Summary(ja):	GNOME デスクトップ用 Python アクセシビリティエク
 Name:		accerciser
 Version:	%{pkg_version}
 Release:	%{pkg_release}
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/accerciser/1.12/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/accerciser/3.1/%{name}-%{version}.tar.xz
 License:	BSD
-Group:		User Interface/Desktops
+Group:		Desktop/Accessibility 
 URL:		http://live.gnome.org/Accerciser
 
 Requires:	gnome-python-libwnck >= 2.14
@@ -90,16 +90,17 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/accerciser/*
 %{_datadir}/gnome/help/accerciser/*
-%{_datadir}/omf/accerciser/*
 %{_datadir}/locale/*/*/accerciser*
 %{_mandir}/man1/accerciser.1.gz
 %{_sysconfdir}/gconf/schemas/accerciser.schemas
 
 
 %changelog
-* Sun Oct 10 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.1-1
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+
+* Mon May 02 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.1-1
 - new upstream release
-- change Group: User Interface/Desktops instead of Desktop/Accessibility
 
 * Sun Oct 10 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.0-1
 - initial build for Vine Linux

+ 134 - 0
a/accountsservice/accountsservice-vl.spec

@@ -0,0 +1,134 @@
+
+Name:           accountsservice
+Version:        0.6.13
+Release:        1%{?_dist_release}
+Summary:        D-Bus interfaces for querying and manipulating user account information
+
+Group:          System Environment/Daemons
+License:        GPLv3+
+URL:            http://www.fedoraproject.org/wiki/Features/UserAccountDialog
+#VCS: git:git://git.freedesktop.org/accountsservice
+Source0:        http://mclasen.fedorapeople.org/accounts/accountsservice-%{version}.tar.xz
+
+BuildRequires:  glib2-devel
+BuildRequires:  dbus-glib-devel
+BuildRequires:  polkit-devel
+BuildRequires:  intltool
+# BuildRequires:  systemd-units
+BuildRequires:  gobject-introspection-devel
+
+Requires:       polkit
+Requires:       ConsoleKit
+Requires:       shadow-utils
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%package libs
+Summary: Client-side library to talk to accountservice
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+The accountsservice-libs package contains a library that can
+be used by applications that want to interact with the accountsservice
+daemon.
+
+
+%package devel
+Summary: Development files for accountsservice-libs
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+The accountsservice-devel package contains headers and other
+files needed to build applications that use accountsservice-libs.
+
+
+%description
+The accountsservice project provides a set of D-Bus interfaces for
+querying and manipulating user account information and an implementation
+of these interfaces, based on the useradd, usermod and userdel commands.
+
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
+%find_lang accounts-service
+
+
+%files -f accounts-service.lang
+%defattr(-,root,root,-)
+%doc COPYING README AUTHORS
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.Accounts.conf
+%{_libexecdir}/accounts-daemon
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.User.xml
+%{_datadir}/dbus-1/system-services/org.freedesktop.Accounts.service
+%{_datadir}/polkit-1/actions/org.freedesktop.accounts.policy
+%dir %{_localstatedir}/lib/AccountsService/
+%dir %{_localstatedir}/lib/AccountsService/users
+%dir %{_localstatedir}/lib/AccountsService/icons
+#/lib/systemd/system/accounts-daemon.service
+
+%files libs
+%{_libdir}/libaccountsservice.so.*
+%{_libdir}/girepository-1.0/AccountsService-1.0.typelib
+
+%files devel
+%{_includedir}/accountsservice-1.0
+%{_libdir}/libaccountsservice.so
+%{_libdir}/pkgconfig/accountsservice.pc
+%{_datadir}/gir-1.0/AccountsService-1.0.gir
+
+%changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.13-1
+- initial build for Vine Linux
+
+
+* Mon Jun 06 2011 Ray Strode <rstrode@redhat.com> 0.6.12-1
+- Update to latest release
+
+* Wed May 18 2011 Matthias Clasen <mclasen@redhat.com> 0.6.11-1
+- Update to 0.6.11
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb 02 2011 Ray Strode <rstrode@redhat.com> 0.6.3-1
+- Update to 0.6.3
+
+* Thu Jan 27 2011 Matthias Clasen <mclasen@redhat.com> 0.6.2-1
+- Update to 0.6.2
+
+* Wed Jul 21 2010 Matthias Clasen <mclasen@redhat.com> 0.6.1-1
+- Update to 0.6.1
+- Install systemd unit file
+
+* Mon Apr  5 2010 Matthias Clasen <mclasen@redhat.com> 0.6-2
+- Always emit changed signal on icon change
+
+* Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> 0.6-1
+- Update to 0.6
+
+* Mon Mar 22 2010 Matthias Clasen <mclasen@redhat.com> 0.5-1
+- Update to 0.5
+
+* Mon Feb 22 2010 Bastien Nocera <bnocera@redhat.com> 0.4-3
+- Fix directory ownership
+
+* Mon Feb 22 2010 Bastien Nocera <bnocera@redhat.com> 0.4-2
+- Add missing directories to the filelist
+
+* Fri Jan 29 2010 Matthias Clasen <mclasen@redhat.com> 0.4-1
+- Initial packaging, based on work by Richard Hughes

+ 12 - 15
a/anjuta-extras/anjuta-extras-vl.spec

@@ -1,16 +1,15 @@
-Version:	2.32.1.1
+Version:	3.1.4
 Release:	1%{?_dist_release}
 
 Summary:	Several non-core plugins for anjuta
 Name:		anjuta-extras
-Source0:	%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}.tar.xz
 License:	GPL2
 Group:		Applications/Development
 URL: 		http://projects.gnome.org/anjuta/
 Summary(ja):	anjutaのいくつかの外部プラグイン
 
 Requires: 	anjuta
-Requires:	libgnomecanvas
 Requires:	valgrind
 Requires:	graphviz
 BuildRequires:	anjuta-devel
@@ -57,34 +56,32 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/anjuta/libanjuta-*.la
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/anjuta-*.schemas > /dev/null
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
-%preun
-if [ $1 = 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/anjuta-*.schemas > /dev/null
-fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/anjuta-*.schemas
 %{_libdir}/anjuta/anjuta-*.plugin
 %{_libdir}/anjuta/libanjuta-*.so*
-%{_libdir}/anjuta/profiler.plugin
 %{_datadir}/anjuta/glade/*.ui
 %{_datadir}/anjuta/glade/*.png
 %{_datadir}/anjuta/properties/*.properties
 %{_datadir}/anjuta/ui/anjuta-sample.ui
-%{_datadir}/anjuta/ui/anjuta-valgrind.xml
-%{_datadir}/anjuta/ui/profiler.xml
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/pixmaps/anjuta/anjuta-*.png
 %{_datadir}/pixmaps/anjuta/anjuta-*.svg
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+
 * Tue Jan 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1.1-1
 - new upstream release
 

+ 60 - 53
a/anjuta/anjuta-vl.spec

@@ -1,7 +1,7 @@
-%define	pkg_version	2.32.1.1
+%define	pkg_version	3.1.4
 
 %define	glib_required		2.26.0
-%define	gtk_required		2.22.0
+%define	gtk_required		3.0.0
 %define	orbit_required		2.14.19
 #%define	libglade2_required	2.3.0
 %define	glade3_required     3.6.2
@@ -20,7 +20,7 @@
 #%define	binutils_required	2.15.92
 %define	libwnck_required	2.30
 %define	gda_required		4.2.0
-%define	unique_required		1.0.0
+%define	unique_required		3.0.0
 
 %define	desktop_vendor	anjuta
 
@@ -32,7 +32,7 @@ Name:		anjuta
 License:	GPL2
 Group:		Applications/Development
 URL:		http://www.anjuta.org/
-Source:		%{name}-%{version}.tar.bz2
+Source:		%{name}-%{version}.tar.xz
 #Patch:		%{name}-utils.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Vendor:		Project Vine
@@ -43,11 +43,11 @@ Requires:	autogen
 Requires:	gdb
 Requires:	glib2		>= %{glib_required}
 #Requires:	gdk-pixbuf >= %{gdk_pixbuf_required}
-Requires:	gtk2		>= %{gtk_required}
+Requires:	gtk3		>= %{gtk_required}
 Requires:	ORBit2		>= %{orbit_required}
 #Requires:	libglade2	>= %{libglade2_required}
 Requires:	GConf2		>= %{gconf_required}
-Requires:	vte		>= %{vte_required}
+Requires:	vte3		>= %{vte_required}
 Requires:	libxml2		>= %{libxml_required}
 Requires:	devhelp		>= %{libdevhelp_required}
 Requires:	gdl		>= %{gdl_required}
@@ -57,7 +57,7 @@ Requires:	subversion	>= %{subversion_required}
 Requires:	libwnck		>= %{libwnck_required}
 Requires:	libgda		>= %{gda_required}
 Requires:	gda-sqlite	>= %{gda_required}
-Requires:	unique		>= %{unique_required}
+Requires:	unique3		>= %{unique_required}
 #Requires:	pango >= 1.1.1
 #Requires:	pcre >= 3.9
 #Requires:	gnome-build >= 0.2.0
@@ -65,19 +65,23 @@ Requires:	e2fsprogs
 Requires:	libSM
 #Requires:	valgrind
 Requires:	libuuid
-Requires:	gtksourceview2
+Requires:	gtksourceview3
+
+Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRequires:	autogen
 BuildRequires:	pkgconfig
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	gettext >= 0.10
+BuildRequires:	flex
+BuildRequires:	bison
 BuildRequires:  glib2-devel	>= %{glib_required}
-BuildRequires:  gtk2-devel	>= %{gtk_required}
+BuildRequires:  gtk3-devel	>= %{gtk_required}
 BuildRequires:  ORBit2-devel	>= %{orbit_required}
 #BuildRequires:  libglade2-devel	>= %{libglade2_required}
 BuildRequires:  glade3-devel	>= %{glade3_required}
 BuildRequires:	GConf2-devel	>= %{gconf_required}
-BuildRequires:  vte-devel	>= %{vte_required}
+BuildRequires:  vte3-devel	>= %{vte_required}
 BuildRequires:  libxml2-devel	>= %{libxml_required}
 BuildRequires:  devhelp-devel	>= %{libdevhelp_required}
 BuildRequires:  gdl-devel	>= %{gdl_required}
@@ -86,7 +90,7 @@ BuildRequires:  neon-devel	>= %{neon_required}
 BuildRequires:  subversion-devel	>= %{subversion_required}
 BuildRequires:	libwnck-devel	>= %{libwnck_required}
 BuildRequires:	libgda-devel	>= %{gda_required}
-BuildRequires:	unique-devel	>= %{unique_required}
+BuildRequires:	unique3-devel	>= %{unique_required}
 #BuildRequires:  pango-devel	>= 1.1.1
 #BuildRequires:  pcre-devel	>= 3.9
 #BuildRequires:  gnome-build-devel	>= 0.2.0
@@ -96,13 +100,14 @@ BuildRequires:	intltool
 BuildRequires:	libSM-devel
 #BuildRequires:	binutils-devel
 BuildRequires:	libuuid-devel
-BuildRequires:	gtksourceview2-devel
+BuildRequires:	gtksourceview3-devel
 BuildRequires:	gnome-doc-utils
 BuildRequires:	vala-devel
 BuildRequires:	vala-tools
 BuildRequires:	sqlite3-devel
 BuildRequires:	python-devel
 BuildRequires:	pygobject-devel
+BuildRequires:	graphviz-devel
 
 Provides: perl(GBF::Make)
 
@@ -135,11 +140,24 @@ Anjuta がそれを解決してくれます。
 #%%description docs
 #Anjuta documentation
 
+%package libs
+Summary: Libraries for use in anjuta extentions
+Summary(ja): anjuta 拡張機能で利用するライブラリ
+Group: User Interface/Desktops
+
+%description libs
+This package provides libraries required by anjuta extention
+module.
+
+%description -l ja libs
+このパッケージは、anjuta 拡張機能が必要とするライブラリを提供します。
+
+
 %package devel
 Summary: Libraries and include files for Anjuta plugins development.
 Summary(ja): Anjuta の開発環境
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: GConf2-devel
 Requires: gtk2-devel
 Requires: pkgconfig
@@ -159,14 +177,12 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC"
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 %find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/anjuta/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladeanjuta.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # conflicts file from gnome-panel
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
@@ -178,10 +194,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 if which update-mime-database>/dev/null 2>&1; then \
     update-mime-database %{_datadir}/mime; \
 fi
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/anjuta*.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/file-manager.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/preferences.schemas > /dev/null
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -198,45 +210,28 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 #%%postun docs
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
-%preun
-if [ $1 = 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/anjuta*.schemas > /dev/null
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/file-manager.schemas > /dev/null
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/preferences.schemas > /dev/null
-fi
+%postttans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 %doc doc/ScintillaDoc.html
-%{_sysconfdir}/gconf/schemas/%{name}*.schemas
-%{_sysconfdir}/gconf/schemas/file-manager.schemas
-%{_sysconfdir}/gconf/schemas/preferences.schemas
-%{_sysconfdir}/gconf/schemas/python-plugin-properties.schemas
-%{_bindir}/%{name}*
-%{_bindir}/gbf-*
-%{_libdir}/lib%{name}.so.*
-%{_libdir}/lib%{name}-foocanvas.so.*
-%{_libdir}/%{name}/lib%{name}*.so
-%{_libdir}/%{name}/libfile-manager.so*
-%{_libdir}/%{name}/libjs*.so*
-%{_libdir}/%{name}/libgbf*.so
-%{_libdir}/%{name}/liblanguage-manager.so
-%{_libdir}/%{name}/libdir-project.so
-%{_libdir}/%{name}/*.plugin
-%{_libdir}/%{name}/libpython_plugin*.so*
-%{_libdir}/%{name}/anjuta-python-autocomplete.py
-%{_libdir}/glade3/modules/libgladeanjuta.so
-%{_libdir}/girepository-1.0/*.typelib
+%{_bindir}/%{name}
+%{_bindir}/%{name}-launcher
+%{_bindir}/%{name}-tags
+%{_libdir}/%{name}/*
+%{_libdir}/glade/modules/libgladeanjuta.so
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/*
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/%{name}/*
 %{_mandir}/man1/*
@@ -247,20 +242,32 @@ fi
 %{_datadir}/gnome/help/%{name}-faqs
 %{_datadir}/gnome/help/%{name}-manual
 %{_datadir}/gnome/help/%{name}-build-tutorial
-%{_datadir}/omf/anjuta-manual/%{name}-manual-*.omf
+
+%files libs
+%defattr(-, root, root)
+%{_libdir}/girepository-1.0/*.typelib
+%{_libdir}/libanjuta-3.so.*
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}-foocanvas.so
-%{_libdir}/pkgconfig/libanjuta-1.0.pc
-%{_includedir}/libanjuta-1.0
+%{_libdir}/libanjuta-3.so
+%{_libdir}/pkgconfig/libanjuta-3.0.pc
+%{_includedir}/libanjuta-3.0
 %{_datadir}/gtk-doc/html/lib%{name}
-%{_datadir}/glade3/catalogs/anjuta-glade.xml
+%{_datadir}/glade/catalogs/anjuta-glade.xml
 %{_datadir}/gir-1.0/*.gir
 
 
 %changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: vte3-devel instead of vte-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- change BuildRequires: gtksourceview3-devel instead of gtksourceview2-devel
+- add BuildRequires: flex, bison, graphviz-devel
+- create -libs sub package
+
 * Thu Dec 30 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1.1-1
 - new upstream release
 

+ 155 - 0
a/apg/apg-vl.spec

@@ -0,0 +1,155 @@
+Summary:	Automated Password Generator for random password generation
+Name:		apg
+
+Version:	2.3.0b
+Release:	1%{?_dist_release}
+License:	BSD
+Group:		System Environment/Base
+URL:		http://www.adel.nursat.kz/%{name}/
+
+Source0:	http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz
+Source1:	apg.xinetd
+Patch0:		apg-2.3.0b-gen_rand_pass.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): grep
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+%description
+APG (Automated Password Generator) is the tool set for random password
+generation. This standalone version generates some random words of
+required type and prints them to standard output.
+
+%prep
+%setup -q
+%patch0 -p1 -b .gen_rand_pass
+
+%build
+# Build server
+make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv
+
+# Build standalone files
+make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+install -D apg %{buildroot}%{_bindir}/apg
+install -D apgbfm %{buildroot}%{_bindir}/apgbfm
+install -D apgd %{buildroot}%{_sbindir}/apgd
+install -D -m 644 doc/man/apg.1 %{buildroot}%{_mandir}/man1/apg.1
+install -D -m 644 doc/man/apgbfm.1 %{buildroot}%{_mandir}/man1/apgbfm.1
+install -D -m 644 doc/man/apgd.8 %{buildroot}%{_mandir}/man8/apgd.8
+
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/apgd
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%post
+# add a service for apg if it doesn't already exist
+if ! grep -q ^pwdgen /etc/services; then
+    echo -e 'pwdgen\t\t129/tcp\t\t\t# PWDGEN service' >> /etc/services
+fi
+
+
+%files
+%defattr(-, root, root)
+%doc CHANGES COPYING README THANKS TODO doc/rfc*
+%{_bindir}/apg
+%{_bindir}/apgbfm
+%{_sbindir}/apgd
+%{_mandir}/man*/*
+%{_sysconfdir}/xinetd.d/apgd
+
+%changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.0b-1
+- initial build for Vine Linux
+
+
+* Mon Mar 14 2011 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-11
+- Add Requires(post) on grep. Fixes bug #684779
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0b-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0b-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0b-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Aug 11 2008 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-7
+- Fix permissions. Fixes #453621
+
+* Sun Feb 10 2008 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-6
+- Rebuild for gcc43
+
+* Tue Aug 21 2007 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-5
+- Fix incorrect license tag
+- Fix incorrect sources
+
+* Sun Aug 27 2006 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-4
+- Rebuild for fc6
+
+* Thu Feb 16 2006 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-3
+- Rebuild for fc5
+
+* Sat Jul 30 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3.0b-2
+- Fix -y segfault (#164698).
+- Make with CFLAGS and FLAGS to build with RPM optflags to
+  repair debuginfo package.
+
+* Fri Apr 22 2005 Oliver Falk <oliver@linux-kernel.at>				- 2.3.0b-1_FC4
+- Add FC4 to the release tag, so it's newer than the FC3 package
+
+* Mon Apr 11 2005 Oliver Falk <oliver@linux-kernel.at>				- 2.3.0b-1
+- Merge FC devel specfile with lkernAT specfile (=> update)
+- Has now support for xinetd
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.2.3-3
+- Bump release to provide Extras upgrade path.
+- Nicer mode fix for the sources.
+
+* Sun Sep 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.2.3-0.fdr.2
+- Fixed file permission on source tarball.
+- Brought spec more in line with current template.
+
+* Mon Sep 15 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.2.3-0.fdr.1
+- Updated to 2.2.3.
+
+* Mon Sep 01 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.2.2-0.fdr.1
+- Updated to 2.2.2.
+
+* Tue Aug 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.2.0-0.fdr.1
+- Updated to 2.2.0.
+
+* Wed Jul 30 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.1.0-0.fdr.1
+- Fedorafication.
+
+* Mon Mar 31 2003 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Rebuilt for Red Hat Linux 9.
+- Added _smp_mflags macro.
+
+* Fri Oct  4 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 2.1.0.
+
+* Thu May  2 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 2.0.0final.
+
+* Tue Feb 27 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.2.13.
+
+* Fri Feb 16 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.2.11.
+
+* Thu Feb 15 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.2.1.
+
+* Wed Feb  7 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Initial RPM release.
+

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

@@ -2,22 +2,26 @@
 %define __libtoolize :
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define glib2_base_version 2.26.0
+%define glib2_base_version 2.28.0
 %define glib2_version %{glib2_base_version}
 
 Summary: Interfaces for accessibility support.
 Summary(ja): アクセシビリティサポートのためのインタフェース
 Name: atk
-Version: 1.32.0
+Version: 2.1.0
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.32/atk-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/atk/2.1/atk-%{version}.tar.xz
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= 0.6.7
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 The ATK library provides a set of interfaces for adding accessibility
 support to applications and graphical user interface toolkits. By
@@ -122,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.0-1
+- new upstream release
+
 * Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.30.2-1
 - add BuildRequires: gobject-introspection-devel
 - add configure option (--enable-introspection=yes)

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

@@ -3,7 +3,7 @@
 Summary: A C++ wrapper for atk
 Summary(ja): atk の C++ ラッパー
 Name: atkmm
-Version: 2.22.2
+Version: 2.22.5
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{ver}/examples
 %{_datadir}/devhelp/books/*
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.5-1
+- new upstream release
+
 * Sun Jan 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.2-1
 - new upstream release
 

+ 44 - 33
a/avahi/avahi-vl.spec

@@ -7,7 +7,7 @@ Summary:        Local network service discovery
 Summary(ja):	ローカルネットワークサービス検出システム
 Name:           avahi
 Version:        0.6.30
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
@@ -17,7 +17,7 @@ Patch10:	avahi-0.6.25-vine.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gtk2-devel, qt-devel, libglade2-devel, glib2-devel
-###BuildRequires:  gtk3-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  qt4-devel
 BuildRequires:  libdaemon-devel >= 0.12
 BuildRequires:  libcap-devel, dbus-devel, expat-devel
@@ -68,14 +68,14 @@ Requires: gtk2-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
-###%package ui-gtk3
-###Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
-###Group: System Environment/Base
-###Requires: %{name} = %{version}-%{release}
-###Requires: gtk3
+%package ui-gtk3
+Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: gtk3
 
-###%description ui-gtk3
-###This library contains a Gtk 3.x widget for browsing services.
+%description ui-gtk3
+This library contains a Gtk 3.x widget for browsing services.
 
 %package glib
 Summary: Glib libraries for avahi
@@ -210,15 +210,15 @@ Requires: compat32-gtk2-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
-###%package -n compat32-%{name}-ui-gtk3
-###Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
-###Group: System Environment/Base
-###Requires: %{name}-ui-gtk3 = %{version}-%{release}
-###Requires: compat32-%{name} = %{version}-%{release}
-###Requires: compat32-gtk3
+%package -n compat32-%{name}-ui-gtk3
+Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
+Group: System Environment/Base
+Requires: %{name}-ui-gtk3 = %{version}-%{release}
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: compat32-gtk3
 
-###%description -n compat32-%{name}-ui-gtk3
-###This library contains a Gtk 3.x widget for browsing services.
+%description -n compat32-%{name}-ui-gtk3
+This library contains a Gtk 3.x widget for browsing services.
 
 %package -n compat32-%{name}-glib
 Summary: Glib libraries for avahi
@@ -331,9 +331,7 @@ necessary for developing programs using avahi.
 %build
 autoreconf -i
 
-%configure \
-  --disable-gtk3 \
-  --with-distro=vine \
+%configure --with-distro=vine \
   --disable-monodoc --without-python-twisted \
   --with-avahi-user=avahi --with-avahi-group=avahi \
   --enable-compat-howl --enable-compat-libdns_sd \
@@ -405,13 +403,13 @@ fi
 
 %postun
 /sbin/ldconfig
-if [ "$1" -ge "1" ]; then
+if [ "$1" -eq "0" ]; then
    /sbin/service avahi-daemon condrestart >/dev/null 2>&1
    /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
 fi
       
 %preun
-if [ "$1" -eq 0 ]; then
+if [ "$1" -eq "0" ]; then
     /sbin/service avahi-daemon stop > /dev/null 2>&1
     /sbin/chkconfig --del avahi-daemon
     /sbin/service avahi-dnsconfd stop >/dev/null 2>&1
@@ -422,6 +420,10 @@ fi
 
 %postun ui -p /sbin/ldconfig
 
+%post ui-gtk3 -p /sbin/ldconfig
+
+%postun ui-gtk3 -p /sbin/ldconfig
+
 %post glib -p /sbin/ldconfig
 
 %postun glib -p /sbin/ldconfig
@@ -446,6 +448,10 @@ fi
 
 %postun -n compat32-%{name}-ui -p /sbin/ldconfig
 
+%post -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
+
+%postun -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
+
 %post -n compat32-%{name}-glib -p /sbin/ldconfig
 
 %postun -n compat32-%{name}-glib -p /sbin/ldconfig
@@ -523,14 +529,14 @@ fi
 %files ui-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-ui.so
-###%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
+%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
 %{_includedir}/avahi-ui
 %{_libdir}/pkgconfig/avahi-ui.pc
-###%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
-###%files ui-gtk3
-###%defattr(0755, root, root, 0755)
-###%{_libdir}/libavahi-ui-gtk3.so.*
+%files ui-gtk3
+%defattr(0755, root, root, 0755)
+%{_libdir}/libavahi-ui-gtk3.so.*
 
 %files glib
 %defattr(0755, root, root, 0755)
@@ -602,13 +608,13 @@ fi
 %files -n compat32-%{name}-ui-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-ui.so
-###%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
+%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
 %{_libdir}/pkgconfig/avahi-ui.pc
-###%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
-###%files -n compat32-%{name}-ui-gtk3
-###%defattr(0755, root, root, 0755)
-###%{_libdir}/libavahi-ui-gtk3.so.*
+%files -n compat32-%{name}-ui-gtk3
+%defattr(0755, root, root, 0755)
+%{_libdir}/libavahi-ui-gtk3.so.*
 
 %files -n compat32-%{name}-glib
 %defattr(0755, root, root, 0755)
@@ -648,7 +654,12 @@ fi
 %endif
 
 %changelog
-* Sat Jul 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.30-1
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.30-2
+- new upstream release
+- add -ui-gtk3 sub package
+- add BuildRequires: gtk3-devel
+
+* Sun Jul 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.30-1
 - new upstream release
 
 * Tue Apr 26 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.6.25-5

+ 31 - 17
b/brasero/brasero-vl.spec

@@ -2,22 +2,20 @@ Summary:   Gnome CD/DVD burning application
 Summary(ja): Gnome CD/DVD 書き込みアプリケーション
 
 Name:      brasero
-Version:   2.32.1
+Version:   3.0.0
 Release:   1%{?_dist_release}
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.32/%{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=573789
-# http://bugzilla.gnome.org/show_bug.cgi?id=573790
-# http://bugzilla.gnome.org/show_bug.cgi?id=573791
-Source1:   nautilus-cd-burner.desktop
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/3.0/%{name}-%{version}.tar.bz2
+Patch0:    brasero-desktop-file.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+
 BuildRequires:  glib2-devel >= 2.26.0
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
-BuildRequires:  GConf2-devel >= 2.32.0
+BuildRequires:  GConf2-devel >= 2.32.2
 BuildRequires:  gstreamer-devel >= 0.10.15
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:  totem-pl-parser-devel >= 2.32.0
@@ -31,14 +29,17 @@ BuildRequires:  libburn-devel >= 0.4.0
 BuildRequires:  libisofs-devel >= 0.6.4
 BuildRequires:  nautilus-devel >= 2.32.0
 BuildRequires:  libSM-devel
-BuildRequires:  unique-devel >= 1.0.0
-BuildRequires:  libcanberra-devel 
+BuildRequires:  unique3-devel >= 3.0.0
+BuildRequires:  libcanberra-gtk3-devel 
 BuildRequires:  gobject-introspection-devel 
 
 Requires:  dvd+rw-tools
-Requires:  cdrecord
-Requires:  mkisofs
-Requires:  cdda2wav
+# cdrecord
+Requires:  wodim
+# mkisofs
+Requires:  genisoimage
+# cdda2wav
+Requires:  icedax
 Requires:  cdrdao
 
 Requires(post):    shared-mime-info
@@ -51,6 +52,9 @@ Obsoletes:	nautilus-cd-burner <= 2.25.3
 
 Provides:	nautilus-cd-burner <= 2.25.3
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 %description
 Simple and easy to use CD/DVD burning application for the Gnome
@@ -90,10 +94,12 @@ developing brasero applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop-file
 
 
 %build
 %configure \
+	--with-gtk=3.0 \
         --enable-nautilus \
 	--enable-libburnia \
 	--enable-search \
@@ -172,7 +178,7 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_mandir}/man1/%{name}.*
 %{_bindir}/*
-%{_libdir}/%{name}
+%{_libdir}/%{name}3
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-nautilus.desktop
@@ -189,21 +195,29 @@ fi
 
 %files nautilus
 %defattr(-,root,root,-)
-%{_libdir}/nautilus/extensions-2.0/*.so
-%{_libdir}/girepository-1.0
+%{_libdir}/nautilus/extensions-3.0/*.so
+%{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/applications/brasero-nautilus.desktop
 
 %files devel
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/libbrasero-burn
 %doc %{_datadir}/gtk-doc/html/libbrasero-media
-%{_includedir}/brasero
+%{_includedir}/%{name}3
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/*.gir
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change Requires: wodim insread of cdrecord
+- change Requires: genisoimage insread of mkisofs
+- change Requires: icedax instead of cdda2wav
+- add Patch0 (brasero-desktop-file.patch) from fedora
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 

+ 8 - 1
b/bug-buddy/bug-buddy-vl.spec

@@ -1,5 +1,5 @@
 %define ver	2.32.0
-%define rel	1%{?_dist_release}
+%define rel	2%{?_dist_release}
 
 Summary:        A bug reporting utility for GNOME.
 Summary(ja):    GNOME用バグ報告ユーティリティ
@@ -26,6 +26,10 @@ BuildRequires: gnome-doc-utils >= 0.3.2
 Requires(post,postun): scrollkeeper
 Requires(post): GConf2
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 Bug-buddy is a bug reporting utility for the GNOME desktop GUI
 environment. Bug-buddy can obtain a stack trace from a core file or
@@ -80,6 +84,9 @@ scrollkeeper-update > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-2
+- rebuild with evolution-data-server-3.1.4
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 

+ 7 - 1
c/cairomm/cairomm-vl.spec

@@ -1,6 +1,6 @@
 Summary:          Cairomm is the C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.9.8
+Version:          1.10.0
 Release:          1%{?_dist_release}
 URL:              http://www.cairographics.org
 License:          LGPL
@@ -11,6 +11,9 @@ BuildRequires:    cairo-devel >= 1.6.4
 BuildRequires:    libsigc++-devel
 BuildRequires:    pkgconfig
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Cairomm is the C++ API for the cairo graphics library. It offers all the power
 of cairo with an interface familiar to C++ developers, including use of the 
@@ -66,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog reference
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.10.0-1
+- new upstream release
+
 * Sun Jan 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.9.8-1
 - new upstream release
 

+ 36 - 28
c/cheese/cheese-vl.spec

@@ -2,18 +2,18 @@ Summary:        A webcam application for snapshots and movies
 Summary(ja):    スナップショットとムービーを撮るためのウェブカメラアプリケーション
 
 Name:           cheese
-Version:        2.32.0
-Release:        2%{?_dist_release}
+Version:        3.0.2
+Release:        1%{?_dist_release}
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
-Source0:        http://download.gnome.org/sources/cheese/2.32/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/cheese/3.0/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: gtk2-devel >= 2.22.0
-BuildRequires: gnome-desktop-devel >= 2.32.0
-BuildRequires: GConf2-devel >= 2.32.0
+BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: gnome-desktop3-devel >= 3.0.0
+BuildRequires: GConf2-devel >= 2.32.2
 BuildRequires: gstreamer-devel >= 0.10.30
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.30
 BuildRequires: evolution-data-server-devel >= 2.32.0
@@ -28,13 +28,24 @@ BuildRequires: perl(XML::Parser)
 BuildRequires: gnome-doc-utils
 BuildRequires: autoconf, automake, libtool, intltool
 BuildRequires: libgudev1-devel
-BuildRequires: libcanberra-devel
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: clutter-devel
+BuildRequires: clutter-gtk-devel
+BuildRequires: clutter-gst-devel
+BuildRequires: libmx-devel
+BuildRequires: libXtst-devel
+BuildRequires: libgee-devel
+BuildRequires: gnome-video-effects
 
 Requires: gstreamer-plugins-good
 Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2 
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 Cheese is a Photobooth-inspired GNOME application for taking pictures and 
 videos from a webcam. It also includes fancy graphical effects based on the 
@@ -80,27 +91,11 @@ rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/cheese-bugreport.sh
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/cheese.schemas > /dev/null || :
-fi
-
-
-%preun
-if [ "$1" -gt 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/cheese.schemas > /dev/null || :
-fi
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/cheese.schemas > /dev/null || :
 
 
 %postun
@@ -108,28 +103,41 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/cheese
-%{_libdir}/libcheese-gtk*.so.*
+%{_libdir}/libcheese*.so.*
+%{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/applications/cheese.desktop
 %{_datadir}/cheese
 %{_datadir}/icons/hicolor/*/apps/cheese.png
 %{_datadir}/icons/hicolor/scalable/apps/cheese.svg
-%{_datadir}/dbus-1/services/org.gnome.Cheese.service
-%{_sysconfdir}/gconf/schemas/cheese.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/cheese
-%{_libdir}/libcheese-gtk*.so
-%{_libdir}/pkgconfig
+%{_libdir}/libcheese*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
 %{_datadir}/gtk-doc/html/cheese/*
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- add BuildRequires: clutter-devel, clutter-gtk-devel, clutter-gst-devel
+                     libmx-devel, libXtst-devel, libgee-devel, gnome-video-effects
+
 * Mon May 02 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-2
 - create -devel sub package
 

+ 89 - 0
c/clutter-gesture/clutter-gesture-vl.spec

@@ -0,0 +1,89 @@
+Name:           clutter-gesture
+Version:        0.0.2.1
+Release:        1%{?_dist_release}
+Summary:        Gesture Library for Clutter
+
+Group:          System Environment/Libraries
+License:        LGPLv2+ and MIT
+URL:            http://moblin.org/projects/clutter-gesture
+Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0:		clutter-gesture-0.0.2.1-configure.patch
+
+BuildRequires: clutter-devel
+BuildRequires: glib2-devel
+
+# Require these because the git tarball doesn't have the configure built
+BuildRequires: libtool
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+This library allows clutter applications to be aware of gestures 
+and to easily attach some handlers to the gesture events. The library 
+supports both single and multi touch.
+
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
+%prep
+%setup -q
+%patch0 -p1
+
+# The NEWS file contains the license so use it as a COPYING file. Upstream has been contacted to resolve the issue
+cp NEWS COPYING
+
+# run autogen.sh until we have a proper release, but don't run configure twice.
+sed -i '/configure/d' autogen.sh
+./autogen.sh
+
+%build
+%configure --disable-static
+make %{?_smp_mflags} V=1
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libcluttergesture-*.so.*
+%{_libdir}/libengine.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libcluttergesture-*.so
+%{_libdir}/libengine.so
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
+
+%changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.2.1-1
+- initial build for Vine Linux
+
+
+* Sat Dec 19 2009 Peter Robinson <pbrobinson@gmail.com> 0.0.2-2
+- Review updates
+
+* Tue Sep 15 2009 Peter Robinson <pbrobinson@gmail.com> 0.0.2-1
+- Initial packaging

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

@@ -1,18 +1,22 @@
-%define		clutter_gst_version 1.0
-%define		clutter_gst_release 2%{?_dist_release}
+%define		clutter_gst_version 1.3
+%define		clutter_gst_release 1%{?_dist_release}
 
 Name:           clutter-gst
-Version:        %{clutter_gst_version}.0
+Version:        %{clutter_gst_version}.12
 Release:        %{clutter_gst_release}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
+Source0:        http://www.clutter-project.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
+BuildRequires:	gobject-introspection-devel
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 This package contains a video texture actor and an audio player object for
@@ -32,8 +36,7 @@ clutter-gst
 %setup -q
 
 %build
-# enable-introspection1no is 1.0.0 only
-%configure --enable-introspection=no
+%configure --enable-introspection=yes
 make %{?_smp_mflags}
 
 %install
@@ -48,20 +51,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/libclutter-gst-%{clutter_gst_version}.la
-%{_libdir}/libclutter-gst-%{clutter_gst_version}.so.0
-%{_libdir}/libclutter-gst-%{clutter_gst_version}.so.0.*
+%doc AUTHORS COPYING README
+%{_libdir}/libclutter-gst-1.0.so.*
+%{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/gtk-doc/html/clutter-gst
+%exclude %{_libdir}/libclutter-gst-1.0.la
 
 %files devel
 %defattr(-,root,root,-)
-%doc
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-%{clutter_gst_version}.pc
-%{_libdir}/libclutter-gst-%{clutter_gst_version}.so
+%{_libdir}/pkgconfig/clutter-gst-1.0.pc
+%{_libdir}/libclutter-gst-1.0.so
+%{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.12-1
+- new upstream release
+
 * Thu Sep 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.0-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

+ 22 - 15
c/clutter-gtk/clutter-gtk-vl.spec

@@ -1,25 +1,26 @@
-%define         clutter_gtk_version 0.10
+%define         clutter_gtk_version 1.0
 %define         clutter_gtk_release 1%{?_dist_release}
 
 Name:           clutter-gtk
-Version:        %{clutter_gtk_version}.8
+Version:        %{clutter_gtk_version}.2
 Release:        %{clutter_gtk_release}
 Summary:        A basic GTK clutter widget
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/%{clutter_gtk_version}/%{name}-%{version}.tar.bz2
-
-Patch0:		clutter-gtk-0.10.8-gir.patch
+Source0:        http://www.clutter-project.org/sources/%{name}/%{clutter_gtk_version}/%{name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:	clutter-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	autoconf
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 This allows clutter to be embedded in GTK applications. 
 We hope with further work in the future clutter-gtk will 
@@ -29,7 +30,7 @@ also allow the reverse, namely embedding GTK in Clutter
 Summary:        Clutter-gtk development environment
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gtk2-devel clutter-devel
+Requires:       gtk3-devel clutter-devel
 
 %description devel
 Header files and libraries for building a extension library for the
@@ -38,7 +39,6 @@ clutter-gtk
 
 %prep
 %setup -q
-%patch0 -p1 -b .gir
 
 %build
 autoreconf -if
@@ -50,6 +50,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang cluttergtk-1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,23 +60,27 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f cluttergtk-1.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so.*
-%{_datadir}/gtk-doc/html/clutter-gtk
-%{_libdir}/girepository-1.0/GtkClutter-%{clutter_gtk_version}.typelib
+%{_datadir}/gtk-doc/html/clutter-gtk-1.0
+%{_libdir}/girepository-1.0/GtkClutter-1.0.typelib
 
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/pkgconfig/clutter-gtk-%{clutter_gtk_version}.pc
+%{_libdir}/pkgconfig/clutter-gtk-1.0.pc
 %{_libdir}/*.so
-%{_includedir}/clutter-1.0/clutter-gtk
-%{_datadir}/gir-1.0/GtkClutter-%{clutter_gtk_version}.gir
+%{_includedir}/clutter-gtk-1.0/clutter-gtk
+%{_datadir}/gir-1.0/GtkClutter-1.0.gir
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-1
+- new upstream release
+- delete Patch0
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Thu Oct 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.8-1
 - new upstream release
 - add BuildRequires: autoconf

+ 129 - 0
c/clutter-imcontext/clutter-imcontext-vl.spec

@@ -0,0 +1,129 @@
+Name:          clutter-imcontext
+Version:       0.1.6
+Release:       1%{?_dist_release}
+Summary:       IMContext Framework Library for Clutter
+
+Group:         System Environment/Libraries
+License:       LGPLv2
+URL:           http://www.moblin.org/
+Source0:       %{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: glib2-devel
+BuildRequires: clutter-devel
+BuildRequires: gtk-doc
+
+# Require these because the git tarball doesn't have the configure built
+BuildRequires: libtool
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+IMContext Framework Library for Clutter
+
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: clutter-devel
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
+%package docs
+Summary: Documentation package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description docs
+Documentation for development with %{name}.
+
+%prep
+%setup -q
+
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
+./autogen.sh
+
+%build
+%configure --disable-static --enable-gtk-doc
+make %{?_smp_mflags} V=1
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS ChangeLog
+%{_sysconfdir}/clutter-imcontext/enable_autoshow
+%{_bindir}/clutter-scan-immodules
+%{_libdir}/lib%{name}-0.1.so.0
+%{_libdir}/lib%{name}-0.1.so.0.0.0
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}-0.1
+%{_libdir}/pkgconfig/%{name}-0.1.pc
+%{_libdir}/*.so
+
+%files docs
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/%{name}
+
+%changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-1
+- initial build for Vine Linux
+
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jun 19 2010 Peter Robinson <pbrobinson@gmail.com> 0.1.6-3
+- Make docs package noarch
+
+* Sat Jun 19 2010 Peter Robinson <pbrobinson@gmail.com> 0.1.6-2
+- Split out docs to a subpackage - fixes 602882, 604343
+
+* Sat May  1 2010 Peter Robinson <pbrobinson@gmail.com> 0.1.6-1
+- New 0.1.6 upstream release.
+
+* Fri Aug  7 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.4-2
+- Spec file cleanups
+
+* Thu Aug  6 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.4-1
+- New 0.1.4 upstream release.
+- license clarfied so remove spec file note
+- remove upstreamed clutter patches
+
+* Tue Aug  4 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-6
+- Add some more clutter 1.0 bits
+
+* Thu Jul 30 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-5
+- Add a patch for clutter 1.0
+
+* Sun Jul 26 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-4
+- A small fix up
+
+* Mon Jul 20 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-3
+- More review request updates, license clarification
+
+* Sun Jul 19 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-2
+- Updates from the review request
+
+* Wed Jul 15 2009 Peter Robinson <pbrobinson@gmail.com> 0.1.2-1
+- Initial packaging

+ 22 - 15
c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.6.14
+%define         clutter_version 1.7.6
 %define         clutter_release 1%{?_dist_release}
 
 Name:           clutter
@@ -10,12 +10,9 @@ Summary(ja):    リッチなGUIを作成するためのオープンソースラ
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
+Source0:        http://www.clutter-project.org/sources/%{name}/1.7/%{name}-%{version}.tar.xz
 
-# http://bugzilla.openedhand.com/show_bug.cgi?id=2100
-Patch0:         Use-a-native-format-for-atlas-textures.patch
-# http://bugzilla.clutter-project.org/show_bug.cgi?id=2324
-Patch1:         cogl-x11-Trap-glXDestroyPixmap.patch
+Patch0:		clutter-fixdso.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
@@ -36,6 +33,10 @@ BuildRequires:	gettext
 BuildRequires:	gtk-doc
 BuildRequires:  gobject-introspection-devel >= 0.9.5
 BuildRequires:	json-glib-devel
+BuildRequires:	cogl-devel >= 1.7.4
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 Clutter is an open source software library for creating fast, 
@@ -68,6 +69,7 @@ Summary:        Documentation for %{name}
 Summary(ja):    %{name}用のドキュメント
 Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
+BuildArch:	noarch
 
 %description    doc
 Clutter is an open source software library for creating fast, 
@@ -80,8 +82,7 @@ This package contains documentation for clutter.
 
 %prep
 %setup -q
-#%patch0 -p0 -b .atlas-textures
-#%patch1 -p1 -b .glXDestroyPixmap
+%patch0 -p1 -b .dso
 
 
 %build
@@ -110,25 +111,26 @@ rm -rf $RPM_BUILD_ROOT
 #make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang %{name}-1.0
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}-1.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%exclude %{_libdir}/*.la
-%{_libdir}/*.so.0
-%{_libdir}/*.so.0.*
+%{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/*.typelib
-%{_datadir}/locale/*/LC_MESSAGES/*
 
 %files devel
 %defattr(-, root, root)
 %doc ChangeLog
-%{_includedir}/*
+%{_includedir}/clutter-1.0
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gir-1.0/*.gir
@@ -136,11 +138,16 @@ rm -rf $RPM_BUILD_ROOT
 %files doc
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/clutter
-%{_datadir}/gtk-doc/html/cogl
 %{_datadir}/gtk-doc/html/cally
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.6-1
+- new upstream release
+- add BuildRequires: cogl-devel
+- add "BuildArch: noarch" to doc sub package
+- add Patch0 (clutter-fixdso.patch)
+
 * Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.14-1
 - new upstream release
 

+ 106 - 0
c/cogl/cogl-vl.spec

@@ -0,0 +1,106 @@
+%define         cogl_version 1.7.4
+%define         cogl_release 1%{?_dist_release}
+
+Name:           cogl
+Version:        %{cogl_version}
+Release:        %{cogl_release}
+Summary:        A small open source library for using 3D graphics hardware to draw pretty pictures
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.clutter-project.org/
+Source0:        http://www.clutter-project.org/sources/%{name}/1.7/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	libXcomposite-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	pango-devel
+BuildRequires:	gtk-doc
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+Cogl is a small open source library for using 3D graphics hardware to draw
+pretty pictures. The API departs from the flat state machine style of
+OpenGL and is designed to make it easy to write orthogonal components that
+can render without stepping on each others toes.
+
+%package devel
+Summary:        Development tools for cogl
+Summary(ja):    cogl の開発環境
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description devel
+Header files and libraries for building a extension library for the
+cogl.
+
+
+%package        doc
+Summary:        Documentation for cogl
+Summary(ja):    cogl 用のドキュメント
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:	noarch
+
+
+%description    doc
+This package contains documentation for cogl.
+
+
+%prep
+%setup -q
+
+%build
+%configure --enable-gtk-doc \
+	--disable-static \
+	--enable-cairo=yes \
+	--enable-gdk-pixbuf=yes \
+	--enable-cogl-pango=yes \
+	--enable-glx=yes \
+	--enable-introspection=yes
+
+make V=0
+
+%install
+rm -rf $RPM_BUILD_ROOT
+#make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog AUTHORS COPYING NEWS README
+%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/*.typelib
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/cogl
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/cogl
+%{_datadir}/gtk-doc/html/cogl-2.0-experimental
+
+%changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.4-1
+- initial build for Vine Linux
+

+ 150 - 0
c/colord/colord-vl.spec

@@ -0,0 +1,150 @@
+Summary:   Color daemon
+Name:      colord
+Version:   0.1.10
+Release:   1%{?_dist_release}
+License:   GPLv2+ and LGPLv2+
+URL:       http://gitorious.org/colord
+Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
+
+BuildRequires: dbus-devel
+BuildRequires: docbook-utils
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: intltool
+BuildRequires: lcms2-devel
+BuildRequires: libgudev1-devel
+BuildRequires: libusb1-devel
+BuildRequires: polkit-devel
+BuildRequires: sane-devel
+BuildRequires: sqlite3-devel
+Requires: shared-color-profiles
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+colord is a low level system activated daemon that maps color devices
+to color profiles in the system context.
+
+%package devel
+Summary: Development package for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Files for development with %{name}.
+
+%prep
+%setup -q
+
+%build
+%configure \
+        --disable-static \
+        --disable-rpath \
+        --disable-examples \
+        --disable-dependency-tracking
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Remove static libs and libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
+
+# databases
+touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db
+touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
+
+%find_lang %{name}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libexecdir}/colord
+%dir %{_localstatedir}/lib/colord
+%{_bindir}/*
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
+%{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml
+%{_datadir}/polkit-1/actions/org.freedesktop.color.policy
+%{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
+%{_datadir}/man/man1/*.1.gz
+%{_libdir}/libcolord.so.*
+%config %{_sysconfdir}/colord.conf
+/lib/udev/rules.d/*.rules
+%dir %{_datadir}/color/icc/colord
+%{_datadir}/color/icc/colord/*.ic?
+%{_libdir}/colord-sensors
+%ghost %{_localstatedir}/lib/colord/*.db
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/colord-1
+%{_libdir}/libcolord.so
+%{_libdir}/pkgconfig/colord.pc
+
+%changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp 0.1.10-1
+- initial build for Vine Linux
+
+
+* Wed Jul 06 2011 Richard Hughes <richard@hughsie.com> 0.1.10-1
+- New upstream version
+
+* Mon Jun 13 2011 Richard Hughes <richard@hughsie.com> 0.1.9-1
+- New upstream version
+
+* Fri Jun 02 2011 Richard Hughes <richard@hughsie.com> 0.1.8-1
+- New upstream version
+- Add a webcam device kind
+- Add a timestamp when making profiles default
+- Add support for reading and writing ICC profile metadata
+- Allow the client to pass file descriptors out of band to CreateProfile
+- Prettify the device vendor and model names
+- Split out the sensors into runtime-loadable shared objects
+- Provide some GIO async variants for the methods in CdClient
+- Ensure GPhoto2 devices get added to the device list
+
+* Fri May 06 2011 Richard Hughes <richard@hughsie.com> 0.1.7-1
+- New upstream version.
+- Create /var/lib/colord at buildtime not runtime for SELinux
+- Ensure profiles with embedded profile checksums are parsed correctly
+- Move the colorimeter rules to be run before 70-acl.rules
+- Stop watching the client when the sensor is finalized
+- Ensure the source is destroyed when we unref CdUsb to prevent a crash
+- Only enable the volume mount tracking when searching volumes
+
+* Tue Apr 26 2011 Richard Hughes <rhughes@redhat.com> 0.1.6-2
+- Own /var/lib/colord and /var/lib/colord/*.db
+
+* Sun Apr 24 2011 Richard Hughes <richard@hughsie.com> 0.1.6-1
+- New upstream version.
+
+* Thu Mar 31 2011 Richard Hughes <richard@hughsie.com> 0.1.5-1
+- New upstream version.
+
+* Wed Mar 09 2011 Richard Hughes <richard@hughsie.com> 0.1.4-1
+- New upstream version.
+
+* Mon Feb 28 2011 Richard Hughes <richard@hughsie.com> 0.1.3-1
+- New upstream version.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 28 2011 Richard Hughes <richard@hughsie.com> 0.1.1-2
+- Rebuild in the vain hope koji isn't broken today.
+
+* Wed Jan 26 2011 Richard Hughes <richard@hughsie.com> 0.1.1-1
+- New upstream version.
+
+* Thu Jan 13 2011 Richard Hughes <richard@hughsie.com> 0.1.0-1
+- Initial version for Fedora package review.

+ 8 - 2
c/compiz-bcop/compiz-bcop-vl.spec

@@ -1,5 +1,5 @@
 Name: compiz-bcop
-Version: 0.8.4
+Version: 0.8.8
 Release: 1%{?_dist_release}
 Summary: Compiz option code generator       
 Summary(ja): Compiz オプションコードジェネレータ
@@ -7,7 +7,7 @@ Summary(ja): Compiz オプションコードジェネレータ
 Group: Development/Libraries
 License: GPLv2+       
 URL: http://compiz-fusion.org            
-Source0:  http://releases.compiz-fusion.org/0.8.4/%{name}-%{version}.tar.bz2
+Source0:  http://releases.compiz-fusion.org/0.8.8/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # compiz is not available on these arches due to missing libdrm
@@ -18,6 +18,9 @@ BuildRequires: libxslt-devel
 Requires: pkgconfig 
 Requires: util-linux
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 BCOP is a code generator that provides an easy way to handle
 plugin options by generating parts of the plugin code directly
@@ -58,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+
 * Sat Nov 06 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 

+ 11 - 6
c/compiz-plugins-extra/compiz-plugins-extra-vl.spec

@@ -1,14 +1,14 @@
 %define plugins 3d addhelper animationaddon bench bicubic crashhandler cubeaddon extrawm fadedesktop firepaint gears group loginout maximumize mblur notification reflex scalefilter shelf showdesktop showmouse splash trailfocus wallpaper widget
 
 Name: compiz-plugins-extra
-Version: 0.8.6
-Release: 2%{?_dist_release}
+Version: 0.8.8
+Release: 1%{?_dist_release}
 Summary: Additional Compiz plugins
 Summary(ja): Compiz 追加プラグイン集
 Group: User Interface/Desktops        
 License: GPLv2+
 URL: http://compiz.org
-Source0: http://releases.compiz.org/0.8.2/%{name}-%{version}.tar.bz2
+Source0: http://releases.compiz.org/0.8.8/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # libdrm is not available on these arches
@@ -16,16 +16,19 @@ ExcludeArch: s390 s390x ppc64
 
 BuildRequires: compiz-plugins-devel >= %{version}
 BuildRequires: compiz-bcop >= 0.8.2
-BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 BuildRequires: mesa-libGLU-devel
 BuildRequires: libXrender-devel
-BuildRequires: GConf2
 BuildRequires: libjpeg-devel
+BuildRequires: GConf2
 BuildRequires: gawk
+BuildRequires: gettext
+
 Requires: compiz-plugins
 Obsoletes: compiz-fusion-extras < 0.8.0
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 This package contains additional plugins for Compiz
@@ -97,7 +100,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING AUTHORS
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
-%{_datadir}/compiz/reflection.png
 %{_datadir}/compiz/*.png
 %{_includedir}/compiz/compiz-animationaddon.h
 %{_libdir}/pkgconfig/compiz-animationaddon.pc
@@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.6-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

+ 11 - 3
c/compiz-plugins/compiz-plugins-vl.spec

@@ -1,15 +1,15 @@
 %define plugins animation colorfilter expo ezoom jpeg mag mousepoll neg opacify put resizeinfo ring scaleaddon session shift snap staticswitcher text thumbnail vpswitch wall winrules workarounds
 
 Name: compiz-plugins
-Version: 0.8.6
-Release: 2%{?_dist_release}
+Version: 0.8.8
+Release: 1%{?_dist_release}
 Summary: Collection of Compiz plugins
 Summary(ja): Compiz プラグイン集
 Group: User Interface/Desktops        
 License: GPLv2+       
 URL: http://compiz.org            
 
-Source0: http://releases.compiz.org/0.8.2/%{name}-main-%{version}.tar.bz2
+Source0: http://releases.compiz.org/0.8.8/%{name}-main-%{version}.tar.bz2
 # Upstream commit 46960f12a9d213e5f0e841557e2ed2f7ea18cc79
 Patch2: compiz-0.7.8-x_to_glx_workaround.patch
 # Upstream commit 319c3c40ebd0b37c8132ecf60d02154e94299832
@@ -31,12 +31,16 @@ BuildRequires: mesa-libGLU-devel
 BuildRequires: libXrender-devel
 BuildRequires: GConf2
 BuildRequires: libjpeg-devel
+BuildRequires: protobuf-devel
 BuildRequires: gawk
 Requires: compiz
 Obsoletes: beryl-plugins
 Obsoletes: compiz-fusion < 0.8.0
 Provides: compiz-fusion = %{version}
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 This package contains Compiz plugins (a.k.a. CompizFusion)
 
@@ -135,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+- add BuildRequires: protobuf-devel
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.6-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

+ 46 - 24
c/compiz/compiz-vl.spec

@@ -18,8 +18,8 @@ Name:           compiz
 URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
-Version:        0.8.6
-Release:        5%{?_dist_release}
+Version:        0.8.8
+Release:        1%{?_dist_release}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -31,33 +31,47 @@ Requires:	mesa-libGL
 
 Requires(post): desktop-file-utils
 
-BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
-BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
-BuildRequires:  libXcomposite-devel, libXdamage-devel, libXext-devel
-BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  control-center-devel, GConf2-devel
+BuildRequires:  mesa-libGLU-devel
+BuildRequires:	libdrm-devel
+BuildRequires:	libwnck-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXcomposite-devel
+BuildRequires:	libXdamage-devel
+BuildRequires:	libXext-devel
+BuildRequires:  libXfixes-devel
+BuildRequires:	libXmu-devel
+BuildRequires:	libXrandr-devel
+BuildRequires:	libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:	libSM-devel
+
+BuildRequires:	GConf2-devel
+BuildRequires:  control-center-devel
+BuildRequires:  dbus-devel
+BuildRequires:  fuse-devel
 BuildRequires:  gnome-desktop-devel >= 2.30.0
+BuildRequires:  libglade2-devel
+BuildRequires:  librsvg2-devel
+BuildRequires:  libxslt-devel
 BuildRequires:  metacity-devel
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool >= 0.35
 BuildRequires:  gettext
-BuildRequires:  dbus-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:  fuse-devel
+
 %if %{with kde}
 BuildRequires:  kdebase-workspace-devel
 BUildRequires:  dbus-qt-devel
 %endif
 Conflicts:	control-center < 2.32.1-2
 
+# Make sure that former beryl users still have bling
+Obsoletes:	beryl-core
+
 Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
 
-# Make sure that former beryl users still have bling
-Obsoletes: beryl-core
-
 # Patches from fedora
 Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
@@ -82,6 +96,9 @@ Patch2010: compiz-0.8.6-fix-pixmap-size-calculation.patch
 # Vine default options
 Patch3000: compiz-0.8.6-vine-default.patch
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -164,8 +181,8 @@ popd
 %patch1600 -p1 -b .move-check-to-compiz
 
 # upstream patch
-%patch2000 -p1 -b .replace-gdk_draw_drawable-with-cairo-equiv
-%patch2010 -p1 -b .fix-pixmap-size-calculation
+#%patch2000 -p1 -b .replace-gdk_draw_drawable-with-cairo-equiv
+#%patch2010 -p1 -b .fix-pixmap-size-calculation
 
 # vine patch
 %patch3000 -p1 -b .vine-default
@@ -197,7 +214,7 @@ autoreconf
 	--enable-gnome-keybindings	     
 
 
-make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
 
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
@@ -207,12 +224,12 @@ cd ../desktop-effects-%{dialogversion}
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install || exit 1
+make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 echo INSTALLING DESKTOP EFFECTS
 pushd ../desktop-effects-%{dialogversion}
-make DESTDIR=$RPM_BUILD_ROOT install || exit 1
+make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install || exit 1
 #desktop-file-install --vendor vine --delete-original      \
 #  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
 #  $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
@@ -341,11 +358,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
-%{_libdir}/window-manager-settings/libcompiz.so
-%{_datadir}/gnome/wm-properties/compiz-wm.desktop
-%{_datadir}/applications/compiz.desktop
-%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
-%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
+#%{_libdir}/window-manager-settings/libcompiz.so
+#%{_datadir}/gnome/wm-properties/compiz-wm.desktop
+#%{_datadir}/applications/compiz.desktop
+#%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
+#%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/compiz/desktop-effects.glade
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
@@ -379,6 +396,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+- add BuildRequires: libxslt-devel, libglade2-devel
+- drop Patch2000,2010
+
 * Sat Apr 09 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.6-5
 - add Patch3000
   - disable Sync to vblank

+ 7 - 1
c/compizconfig-backend-gconf/compizconfig-backend-gconf-vl.spec

@@ -1,5 +1,5 @@
 Name:           compizconfig-backend-gconf
-Version:        0.8.4
+Version:        0.8.8
 Release:        1%{?_dist_release}
 Summary:        GConf backend for compizconfig
 Summary(ja):    compizconfig の GConf バックエンド
@@ -18,6 +18,9 @@ Requires:       compiz-gnome
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64 
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The Compiz Fusion Project brings 3D desktop visual effects that improve
 usability of the X Window System and provide increased productivity
@@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/compizconfig/backends/libgconf.so
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+
 * Sat Nov 06 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - new upstream release
 

+ 74 - 200
c/control-center/control-center-vl.spec

@@ -1,9 +1,7 @@
-%define gettext_package gnome-control-center-2.0
-
-%define pango_version 1.28.3
-%define gtk2_version 2.22.0
-%define gconf2_version 2.32.0
-%define gnome_desktop_version 2.32.0
+%define pango_version 1.28.4
+%define gtk3_version 3.0.0
+%define gconf2_version 2.32.2
+%define gnome_desktop3_version 3.0.0
 %define libbonobo_version 2.32.0
 %define libgnomekbd_version 2.32.0
 %define gnome_vfs2_version 2.24.4
@@ -21,100 +19,41 @@
 Summary: GNOME Control Center.
 Summary(ja): GNOME コントロールセンター
 Name: control-center
-Version: 2.32.1
-Release: 2%{?_dist_release}
+Version: 3.1.4
+Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 URL: http://www.gnome.org
 
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.32/gnome-control-center-%{version}.tar.bz2
-
-# icons for ubuntu visual effects integration.
-Source20: control-center-visual-effects-icons.tar.bz2
-# messages for visual effects
-Source21: gnome-control-center-2.32.1-vine.ja.po
-
-# fc
-Patch3: control-center-2.19.3-no-gnome-common.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=497807
-Patch5: background-location.patch
-# Fix some useless warnings in libslab
-# http://bugzilla.gnome.org/show_bug.cgi?id=439398
-Patch6: gnome-control-center-2.19.90-no-warnings.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=545075
-Patch22: slab-icon-names.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=555591
-Patch30: default-layout-toggle.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=600021
-Patch31: 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=588729
-Patch45: mnemonic.patch
-
-# http://mail.gnome.org/archives/gnomecc-list/2009-July/msg00015.html
-Patch46: no-tweaks.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=590349
-Patch47: save-as.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=596369
-Patch50: fix-background-tooltips.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=593866
-Patch51: mirror-crash.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=597066
-Patch52: shell-markup.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=596939
-Patch53: keybinding-bugs.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=592348
-Patch54: about-me-delete.patch
-
-Patch55: finger-icons.patch
-
-Patch56: best-shapes.patch
-
-# ubuntu
-Patch101: gnome-control-center-2.28.1-aspect-in-dropdown.patch
-Patch110: gnome-control-center-2.28.1-gnome-mouse-properties-small-screen.patch
-Patch111: gnome-control-center-2.28.1-gnome-about-me-small-screen.patch
-Patch112: gnome-control-center-2.28.1-display-properties-fit-small-screen.patch
-
-# vine
-Patch500: gnome-control-center-2.32.1-desktop-effects-integration.patch
-Patch510: gnome-control-center-2.26.0-use-sans-for-sample-font.patch
-
-# vine default applications
-Patch1000: control-center-2.24.0.1-default-applications.patch
-Patch1010: control-center-pam-fprintd-avail.patch
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.1/gnome-control-center-%{version}.tar.xz
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: inagaki, daisuke
+Packager: inagaki, daisuke, Takemikaduchi
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Obsoletes: gnome, control-center-devel < 2.0
 Obsoletes: fontilus, themus
+
+Provides: gnome-volume-manager < 2.25
+Obsoletes: gnome-volume-manager < 2.25
+
 Requires: metacity >= %{metacity_version}
 Requires: usermode >= %{usermode_version}
 Requires: gnome-settings-daemon
 Requires: gnome-icon-theme
-Requires: gnome-desktop >= %{gnome_desktop_version}
+Requires: gnome-desktop3 >= %{gnome_desktop_version}
 Requires: dbus-x11
+Requires: apg
 Requires(post,pre,preun): GConf2
-Requires(post,postun): desktop-file-utils shared-mime-info gtk2
+Requires(post,postun): desktop-file-utils shared-mime-info gtk3
 
 BuildRequires: gnome-common
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -126,15 +65,26 @@ BuildRequires: metacity-devel >= %{metacity_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: gnome-settings-daemon-devel
-BuildRequires: libcanberra-devel >= %{libcanberra_version}
+BuildRequires: libcanberra-gtk3-devel >= %{libcanberra_version}
 BuildRequires: nautilus-devel
 BuildRequires: alsa-lib-devel
-#BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: gettext-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libXScrnSaver-devel
-BuildRequires: unique-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libSM-devel
+BuildRequires: unique3-devel
+BuildRequires: polkit-devel
+BuildRequires: libgtop2-devel
+BuildRequires: upower-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: cups-devel
+BuildRequires: cheese-devel
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: gnome-online-accounts-devel
+BuildRequires: colord-devel
+BuildRequires: NetworkManager-glib-devel
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -166,57 +116,18 @@ Development tool for GNOME Control Center
 GNOME コントロールセンターの開発用ファイルが含まれています。
 
 %prep
-%setup -q -n gnome-control-center-%{version} -a 20
-
-# patches from fedora
-## %patch3 -p1 -b .no-gnome-common
-%patch5 -p1 -b .background-location
-pushd libslab
-%patch6 -p0 -b .warnings
-popd
-#%patch10 -p0 -b .pam-fprintd
-## %patch22 -p0 -b .slab-icon-names
-## %patch30 -p1 -b .default-layout-toggle
-## %patch46 -p1 -b .no-tweaks
-%patch47 -p1 -b .save-as
-## %patch50 -p1 -b .fix-background-tooltips
-## %patch51 -p1 -b .mirror-crash
-## %patch52 -p1 -b .shell-markup
-## %patch53 -p1 -b .keybinding-bugs
-## %patch54 -p1 -b .about-me-delete
-%patch55 -p1 -b .finger-icons
-%patch56 -p1 -b .best-shapes
-
-# patches from ubuntu
-%patch101 -p1 -b .aspect-in-dropdown.patch
-%patch110 -p1 -b .gnome-mouse-properties_small_screen.patch
-%patch111 -p1 -b .gnome-about-me_small_screen.patch
-## %patch112 -p1 -b .display_properties_fit_small_screen.patch
-
-# Vine patches
-# desktop integration based on ubuntu patch
-%patch500 -p1 -b .desktop-effects-integration
-# use Sans for font-properties sample font.
-%patch510 -p1 -b .use-sans-for-sample-font
-
-# Vine Linux configuration patches
-%patch1000 -p1 -b .default-applications
-%patch1010 -p0 -b .pam-fprintd
-
-# add translations for visual effect integration
-cp -f %{SOURCE21} po/ja.po
+%setup -q -n gnome-control-center-%{version}
 
 %build
-autoreconf -f -i
-
 %configure --disable-static  \
-    --enable-gstreamer \
-    --enable-alsa  \
-    --enable-aboutme \
     --disable-scrollkeeper \
-    --disable-schemas-install \
     --disable-update-mimedb \
     CFLAGS="$RPM_OPT_FLAGS -Wno-error"
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -233,24 +144,13 @@ for i in apps_gnome_settings_daemon_default_editor.schemas		\
 	    rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/$i ;	\
 done
 
-# Add a "valid" OnlyShowIn entry, otherwise desktop-file-install complains
-sed -i -e "s/OnlyShowIn=;/OnlyShowIn=GNOME;/"  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
-
-desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications				\
-  --add-only-show-in GNOME                                              \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-
-sed -i -e "s/OnlyShowIn=GNOME;/OnlyShowIn=;/"  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-theme-installer.desktop
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=161489
-sed -i -e "s/OnlyShowIn=GNOME;//"  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-applications.desktop
+#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/
+# install -m644 visual-effects/*.svg $RPM_BUILD_ROOT%{_datadir}/gnome-control-center/pixmaps/
 
 # we do want this
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
@@ -272,18 +172,17 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime/subclasses
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime/mime.cache
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
-%find_lang %{gettext_package}
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/fdl
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/lgpl
+
+%find_lang gnome-control-center-2.0
+%find_lang gnome-control-center-2.0-timezones
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="control-center.schemas fontilus.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null 2>&1 || :
-done
 
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 update-mime-database %{_datadir}/mime > /dev/null
@@ -292,26 +191,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="fontilus.schemas control-center.schemas"
-    for S in $SCHEMAS; do
-	gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/$S > /dev/null 2>&1 || :
-    done
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="fontilus.schemas control-center.schemas"
-    for S in $SCHEMAS; do
-	gconftool-2 --makefile-uninstall-rule \
-	    %{_sysconfdir}/gconf/schemas/$S > /dev/null 2>&1 || :
-    done
-fi
-
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
@@ -321,58 +200,53 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
-%files -f %{gettext_package}.lang
+%files -f gnome-control-center-2.0.lang -f gnome-control-center-2.0-timezones.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%dir %{_libdir}/window-manager-settings
 %dir %{_datadir}/gnome/wm-properties
 %dir %{_datadir}/gnome-control-center
-%dir %{_datadir}/gnome-control-center/keybindings
-%{_datadir}/gnome-control-center/keybindings/*.xml
-%{_datadir}/gnome-control-center/default-apps/*.xml
-%{_datadir}/gnome-control-center/pixmaps
-%{_datadir}/gnome-control-center/ui
 %{_datadir}/applications/*
-%{_datadir}/gnome/help/*
-%{_datadir}/omf/control-center
 %{_datadir}/desktop-directories/*
-%{_datadir}/polkit-1/actions/org.gnome.randr.policy
-%{_datadir}/mime/packages/gnome-theme-package.xml
+%{_datadir}/gnome/help/*
+%{_datadir}/gnome-control-center/datetime
+%{_datadir}/gnome-control-center/icons
+%{_datadir}/gnome-control-center/keybindings
+%{_datadir}/gnome-control-center/pixmaps
+%{_datadir}/gnome-control-center/sounds
+%{_datadir}/gnome-control-center/ui
 %{_datadir}/icons/*
+%{_datadir}/omf/control-center
+%{_datadir}/pixmaps/*
+%{_datadir}/sounds/*
 # list all binaries explicitly, so we notice if one goes missing
-%{_bindir}/gnome-about-me
-%{_bindir}/gnome-appearance-properties
-%{_bindir}/gnome-at-mobility
-%{_bindir}/gnome-at-properties
-%{_bindir}/gnome-at-visual
 %{_bindir}/gnome-control-center
-%{_bindir}/gnome-default-applications-properties
-%{_bindir}/gnome-display-properties
-%{_bindir}/gnome-keybinding-properties
-%{_bindir}/gnome-keyboard-properties
-%{_bindir}/gnome-mouse-properties
-%{_bindir}/gnome-network-properties
-%{_bindir}/gnome-typing-monitor
-%{_bindir}/gnome-window-properties
-%{_bindir}/gnome-font-viewer
-%{_bindir}/gnome-thumbnail-font
-%{_sbindir}/gnome-display-properties-install-systemwide
+%{_bindir}/gnome-sound-applet
 %{_libdir}/*.so.*
-%{_libdir}/window-manager-settings/*
+%{_libdir}/control-center-1/panels/*.so
 #{_libexecdir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/menus/gnomecc.menu
-%{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
+%{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/pkgconfig/*
 %{_datadir}/pkgconfig/*
 %{_libdir}/*.so
-%{_includedir}/*
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- add BuildRequires: libXxf86misc-devel, libSM-devel, polkit-devel, libgtop2-devel, upower-devel,
+                     pulseaudio-libs-devel, cups-devel, cheese-devel, gstreamer-plugins-base-devel,
+                     gnome-online-accounts-devel, colord-devel, NetworkManager-glib-devel
+- add Requires: apg
+- drop all Patches
+- add Provides: and Obsoletes: gnome-volume-manager
+
 * Sun Mar 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.1-2
 - update desktop-effect-integration patch
   - fix freeze on changing metacity to compiz

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

@@ -9,7 +9,7 @@
 Summary: GLib bindings for D-Bus
 Summary(ja): D-Bus の GLib バインディング
 Name: dbus-glib
-Version: 0.92
+Version: 0.94
 Release: 1%{?_dist_release}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -27,6 +27,9 @@ BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
 BuildRequires: autoconf
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 D-Bus add-on library to integrate the standard D-Bus library with
 the GLib thread abstraction and main loop.
@@ -144,6 +147,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.94-1
+- new upstream release
+
 * Sat Dec 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.92-1
 - new upstream release
 

+ 21 - 4
d/dbus/dbus-vl.spec

@@ -10,7 +10,7 @@
 Summary: D-BUS message bus
 Summary(ja): D-BUS メッセージバスシステム
 Name: dbus
-Version: 1.4.1
+Version: 1.4.14
 Release: 1%{?_dist_release}
 URL: http://www.freedesktop.org/software/dbus/
 License: AFL/GPLv2
@@ -63,7 +63,6 @@ Summary: Libraries and headers for D-BUS
 Summary(ja): D-BUS 用のライブラリとヘッダファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel 
 
 %description devel
 Headers and static libraries for D-BUS.
@@ -78,6 +77,16 @@ Requires: %{name} = %{version}-%{release}
 D-BUS contains some tools that require Xlib to be installed, those are
 in this separate package so server systems need not install X.
 
+%package doc
+Summary: Developer documentation for D-BUS
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+This package contains developer documentation for D-Bus along with
+other supporting documentation such as the introspect dtd file.
+
 # compat32
 %package -n compat32-%{name}
 Summary: D-BUS message bus
@@ -100,7 +109,6 @@ Summary(ja): D-BUS 用のライブラリとヘッダファイル
 Group: Development/Libraries
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
-Requires: compat32-glib2-devel
 
 %description -n compat32-%{name}-devel
 Headers and static libraries for D-BUS.
@@ -108,7 +116,7 @@ Headers and static libraries for D-BUS.
 %prep
 %setup -q
 ## %patch0 -p1 -b .start-early
-%patch1 -p1 -b .generate-xml-docs
+## %patch1 -p1 -b .generate-xml-docs
 %patch6 -p1 -b .increase-timeout
 
 %patch10 -p1 -b .workaround-dbus-sendinterface
@@ -231,6 +239,10 @@ fi
 %{_bindir}/dbus-launch
 %{_datadir}/man/man*/dbus-launch.1.gz
 
+%files doc
+%defattr(-,root,root)
+%doc %{_docdir}/dbus
+
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -244,6 +256,11 @@ fi
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.14-1
+- new upstream release
+- drop Patch1
+- create -doc sub package
+
 * Sat Dec 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.1-1
 - new upstream release
 

+ 27 - 10
d/dconf/dconf-vl.spec

@@ -1,10 +1,10 @@
 # Basic Information
 Name:		dconf
-Version:	0.5.1
+Version:	0.8.0
 Release:	1%{?_dist_release}
 License:	LGPL
 Group:		System Environment/Base
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Vendor:		Project Vine
@@ -16,14 +16,15 @@ Summary(ja):	dconfは、低レベル設定システムです。
 
 # Dependency
 Requires:	glib2
-Requires:	gtk2
+Requires:	gtk3
 Requires:	libgee
 Requires:	libxml2
 
 BuildRequires:	glib2-devel
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	libgee-devel
 BuildRequires:	libxml2-devel
+BuildRequires:	dbus-devel
 
 %description
 dconf is a low-level configuration system. Its main purpose is to provide
@@ -40,9 +41,10 @@ Summary(ja):	%{name} の開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
-Requires:	gtk2-devel
+Requires:	gtk3-devel
 Requires:	libgee-devel
 Requires:	libxml2-devel
+Requires:	dbus-devel
 
 %description devel
 This package contains the headers that programmers will need to develop
@@ -65,6 +67,13 @@ applications which will use %{name}.
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 
+%postun 
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans 
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+
 #%%files -f %{name}.lang
 %files
 %defattr(-,root,root)
@@ -72,23 +81,31 @@ applications which will use %{name}.
 %{_bindir}/dconf
 %{_bindir}/dconf-editor
 %{_libdir}/gio/modules/libdconfsettings.so
-%{_libdir}/girepository-1.0/dconf-1.0.typelib
-%{_libdir}/libdconf.so.*
+%{_libdir}/libdconf*.so.*
 %{_libexecdir}/dconf-service
+%{_sysconfdir}/bash_completion.d/dconf-bash-completion.sh
+%{_datadir}/applications/dconf-editor.desktop
 %{_datadir}/dbus-1/services/ca.desrt.dconf.service
 %{_datadir}/dbus-1/system-services/ca.desrt.dconf.service
+%{_datadir}/dconf-editor/dconf-editor.ui
+%{_datadir}/glib-2.0/schemas/*.xml
 
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/dconf/
-%{_libdir}/libdconf.so
-%{_libdir}/pkgconfig/dconf.pc
+%{_includedir}/dconf-dbus-1/
+%{_libdir}/libdconf*.so
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/dconf/
-%{_datadir}/gir-1.0/dconf-1.0.gir
 %{_datadir}/vala/vapi/dconf.deps
 %{_datadir}/vala/vapi/dconf.vapi
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.0-1
+- new upstream release
+- add BuildRequires: dbus-devel
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Sun Oct 17 2010 Yasumichi Akahoshi <yasumichi@vinelinux.org> 0.5.1-1
 - new package. 
 

+ 9 - 2
d/desktop-file-utils/desktop-file-utils-vl.spec

@@ -1,8 +1,8 @@
 Name: desktop-file-utils
 Summary: Utilities for manipulating .desktop files
 Summary(ja): .desktop ファイルを操作するユーティリティ
-Version: 0.17
-Release: 2%{?_dist_release}
+Version: 0.18
+Release: 1%{?_dist_release}
 
 Group: Development/Tools
 License: GPLv2
@@ -16,6 +16,10 @@ BuildRequires: emacsen
 
 Obsoletes: desktop-file-validator
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 .desktop files are used to describe an application for inclusion in
 GNOME or KDE menus.  This package contains desktop-file-validate which
@@ -49,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.18-1
+- new upstream release
+
 * Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 0.17-2
 - rebuilt with rpm-4.8.1-3
 

+ 12 - 20
d/devhelp/devhelp-vl.spec

@@ -1,8 +1,7 @@
-Version:        2.32.0
+Version:        3.0.0
 Release:        1%{?_dist_release}
 
-%define	gtk_required		2.22.0
-%define	libwnck_required	2.30.5
+%define	gtk_required		3.0.11
 
 Summary:        API document browser
 Summary(ja):    API ドキュメントブラウザ
@@ -10,7 +9,7 @@ Name:           devhelp
 License:        GPL
 Group:          Applications/Development
 Url:            http://live.gnome.org/devhelp
-Source:         http://ftp.gnome.org/pub/GNOME/sources/devhelp/2.32/%{name}-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.0/%{name}-%{version}.tar.bz2
 #Patch10:	%{name}-0.19.1-xulrunner19.patch
 #Patch11:	%{name}-webkit.patch
 #Patch:		%{name}-r1265.patch
@@ -22,16 +21,11 @@ Distribution: Vine Linux
 Packager: yasumichi
 
 Requires(pre,preun,post): GConf2
-Requires(post,postun): gtk2	>= %{gtk_required}
+Requires(post,postun): gtk3	>= %{gtk_required}
 
-BuildRequires:	gtk2-devel	>= %{gtk_required}
+BuildRequires:	gtk3-devel	>= %{gtk_required}
 BuildRequires:	GConf2-devel	>= 2.6.0
-BuildRequires:	libglade2-devel >= 2.4.0
-BuildRequires:	libwnck-devel	>= %{libwnck_required}
-BuildRequires:	zlib-devel
-BuildRequires:	WebKit-gtk-devel >= 1.1.13
-BuildRequires:	libsoup-devel
-BuildRequires:	unique-devel
+BuildRequires:	WebKit3-gtk-devel
 
 %description
 An API document browser for GNOME 2.
@@ -43,13 +37,9 @@ GNOME2 用の API ブラウザです。
 Summary:        Library to embed Devhelp in other applications.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}
-Requires:	gtk2-devel	>= %{gtk_required}
+Requires:	gtk3-devel	>= %{gtk_required}
 Requires:	GConf2-devel	>= 2.6.0
-Requires:	libglade2-devel	>= 2.4.0
-Requires:	libwnck-devel	>= %{libwnck_required}
-Requires:	WebKit-gtk-devel
-Requires:	libsoup-devel
-Requires:	unique-devel
+Requires:	WebKit3-gtk-devel
 
 %description devel
 Library of Devhelp for embedding into other applications.
@@ -110,9 +100,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/lib*.so.*
 %{_datadir}/applications/devhelp.desktop
 %{_datadir}/devhelp
-%{_datadir}/icons/hicolor/scalable/apps/devhelp.svg
 %{_datadir}/icons/hicolor/*/apps/devhelp.png
-%{_libdir}/gedit-2/plugins/*
+%{_libdir}/gedit/plugins/devhelp*
 
 %files devel
 %defattr(-,root,root)
@@ -122,6 +111,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 15 2011 TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 - remove %pre, %preun

+ 24 - 6
e/ekiga/ekiga-vl.spec

@@ -1,10 +1,10 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Summary(ja): GNOME ベースの SIP/H323 遠隔会議アプリケーション
 Name: ekiga
-Version: 3.2.7
-Release: 4%{?_dist_release}
+Version: 3.3.1
+Release: 1%{?_dist_release}
 URL: http://www.ekiga.org/
-Source0: http://www.ekiga.org/ekiga-%{version}.tar.bz2
+Source0: http://www.ekiga.org/ekiga-%{version}.tar.xz
 License: GPL
 Group: Applications/Communications
 
@@ -16,8 +16,8 @@ BuildRequires: libgnome-devel >= 2.24.0
 BuildRequires: avahi-devel >= 0.6.23
 BuildRequires: avahi-glib-devel >= 0.6.23
 BuildRequires: openldap-devel
-BuildRequires: ptlib-devel >= 2.6.2
-BuildRequires: opal-devel >= 3.6.2
+BuildRequires: ptlib-devel >= 2.10.1
+BuildRequires: opal-devel >= 3.10.1
 BuildRequires: libxml2-devel >= 2.6.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -32,12 +32,18 @@ BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libsigc++-devel
 BuildRequires: libXv-devel
+BuildRequires: libnotify-devel
+BuildRequires: libboost-devel
+BuildRequires: libboost-signals
 
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
 Obsoletes: gnomemeeting
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Ekiga is a tool to communicate with video and audio over the internet.
 It uses the standard SIP and H323 protocols.
@@ -46,8 +52,12 @@ It uses the standard SIP and H323 protocols.
 %setup -q
 
 %build
+autoreconf -if
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
-%configure --disable-scrollkeeper --disable-schemas-install
+%configure \
+	--disable-static \
+	--disable-scrollkeeper \
+	--disable-schemas-install
 make %{?_smp_mflags}
 
 %install
@@ -58,6 +68,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 desktop-file-install \
     --vendor gnome \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -109,6 +121,8 @@ fi
 %{_bindir}/ekiga
 %{_bindir}/ekiga-config-tool
 %{_bindir}/ekiga-helper
+%{_libdir}/%{name}/%{version}/libekiga.so
+%{_libdir}/%{name}/%{version}/plugins/*.so
 %{_datadir}/applications/gnome-ekiga.desktop
 %{_datadir}/dbus-1/services/*
 %{_datadir}/pixmaps/*
@@ -117,6 +131,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.3.1-1
+- new upstream release
+- add BuildRequires: libnotify-devel, libboost-devel, libboost-signals
+
 * Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.7-4
 - rebuild with openssl-1.0.0c
 

+ 6 - 1
e/emerald/emerald-vl.spec

@@ -2,7 +2,7 @@ Name:           emerald
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.8.4
+Version:        0.8.8
 Release:        1%{?_dist_release}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
@@ -24,6 +24,8 @@ BuildRequires:  libwnck-devel, gtk2-devel
 BuildRequires:  intltool, desktop-file-utils
 BuildRequires:  perl(XML::Parser), gettext
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 Emerald is themeable window decorator and compositing
@@ -106,6 +108,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- new upstream release
+
 * Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4-1
 - update to 0.8.4
 - add Patch0 (05_build_without_gtk_disable_deprecated.patch)

+ 25 - 9
e/empathy/empathy-vl.spec

@@ -1,13 +1,13 @@
-%define major_ver 2.32
-%define minor_ver 2
+%define major_ver 3.1
+%define minor_ver 4
 %define rel       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,
 ## respectively.
-%global	gtk2_min_version	2.22
-%global	glib2_min_version	2.26.0
+%global	gtk3_min_version	3.0.0
+%global	glib2_min_version	2.28.0
 %global	tp_mc_min_version	5.6.0
 %global	tp_glib_min_version	0.13.0
 %global	tp_logger_min_version	0.1.5
@@ -28,7 +28,7 @@ Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{majorver}/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{majorver}/%{name}-%{version}.tar.xz
 Source1:	%{name}-README.ConnectionManagers
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -43,7 +43,7 @@ BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.17.3
 BuildRequires:	gnome-panel
-BuildRequires:	gtk2-devel >= %{gtk2_min_version}
+BuildRequires:	gtk3-devel >= %{gtk3_min_version}
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
@@ -52,9 +52,9 @@ BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:  farsight2-devel
 BuildRequires:	telepathy-farsight-devel 
-BuildRequires:	libcanberra-devel >= %{libcanberra_version}
+BuildRequires:	libcanberra-gtk3-devel >= %{libcanberra_version}
 BuildRequires:	libgnome-keyring-devel >= %{gnome_keyring_version}
-BuildRequires:	unique-devel
+BuildRequires:	unique3-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	libtelepathy-devel
 BuildRequires:	libgnomecanvas-devel
@@ -64,9 +64,13 @@ BuildRequires:	telepathy-logger-devel >= %{tp_logger_min_version}
 BuildRequires:	gnome-keyring-devel >= %{gnome_keyring_version}
 BuildRequires:	openssl-devel
 BuildRequires:	NetworkManager-glib-devel
-BuildRequires:	WebKit-gtk-devel
+BuildRequires:	WebKit3-gtk-devel
 BuildRequires:	geoclue-devel
 BuildRequires:	enchant-devel
+BuildRequires:	gsettings-desktop-schemas
+BuildRequires:	libICE-devel
+BuildRequires:	cheese-devel
+BuildRequires:	libchamplain-gtk-devel
 
 Requires:	telepathy-filesystem
 ## Empathy is useless without a proper Telepathy connection manager installed.
@@ -99,6 +103,9 @@ Obsoletes: empathy-libs < 2.29.1, empathy-devel < 2.29.1
 ## upstream 2.29.1 removed python bindings' #599039
 Obsoletes: empathy-python < 2.29.1
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Empathy provides a powerful multiple protocol instant messaging
 client using the Telepathy framework.
@@ -183,6 +190,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/empathy-debugger
 %{_libexecdir}/empathy-auth-client
 %{_libexecdir}/empathy-av
+%{_libexecdir}/empathy-chat
 %{_datadir}/dbus-1/services/*
 %{_datadir}/empathy
 %{_datadir}/glib-2.0/schemas/*.xml
@@ -201,6 +209,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change BuildRequires: WebKit3-gtk-devel instead of WebKit-gtk-devel
+- add BuildRequires: gsettings-desktop-schemas, libICE-devel, cheese-devel, libchamplain-gtk-devel
+
 * Sun Jan 30 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.2-1
 - new upstream release
 - add BuildRequires: openssl-devel, NetworkManager-glib-devel, WebKit-devel

+ 21 - 7
e/eog-plugins/eog-plugins-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 2.30.2
+%define pkg_version 3.1.2
 %define pkg_release 1%{?_dist_release}
 
 Summary: Plugins for eog
@@ -6,26 +6,27 @@ Summary(ja): eog用のプラグイン
 Name: eog-plugins
 Version: %{pkg_version}
 Release: %{pkg_release}
-Source0: http://download.gnome.org/sources/eog-plugins/2.30/%{name}-%{version}.tar.bz2
-Patch0: eog-plugins-2.28.1-configure.patch
+Source0: http://download.gnome.org/sources/eog-plugins/3.1/%{name}-%{version}.tar.xz
+Patch0:  %{name}-3.1.2-configure.patch
 License: GPLv2+
 Group: Applications/Graphics
 URL: http://live.gnome.org/EyeOfGnome/Plugins
 
-Requires: gtk2
+Requires: gtk3
 Requires: eog
 Requires: python
 Requires: gnome-python
 Requires: pygtk2
 Requires: libexif
 Requires: libchamplain, libchamplain-gtk
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 BuildRequires: eog-devel
 BuildRequires: pygobject-devel
 BuildRequires: gnome-python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: libexif-devel
 BuildRequires: libchamplain-devel, libchamplain-gtk-devel
+BuildRequires: libpeas-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
@@ -43,10 +44,9 @@ Eye of GNOME イメージビューア用のプラグイン集
 %prep
 %setup -q
 %ifarch x86_64
-%patch0 -p1 -b .patch0
+%patch0 -p1 -b .python
 %endif
 
-
 %build
 %configure --with-plugins=map,exif-display,fit-to-width,pythonconsole,slideshowshuffle
 %{__make} %{?_smp_mflags}
@@ -65,14 +65,28 @@ Eye of GNOME イメージビューア用のプラグイン集
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS README
 %{_libdir}/*
+%{_datadir}/eog/plugins/exif-display/*.ui
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
 
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+- add BuildRequires: libpeas-devel
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- update Patch0
+
 * Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-1
 - new upstream release
 - change BuildRequires: eog-devel instead of eog

+ 36 - 44
e/eog/eog-vl.spec

@@ -1,36 +1,32 @@
-%define glib2_version 2.26.1
-%define pango_version 1.28.3
-%define gtk2_version 2.22.1
-%define gconf2_version 2.32.0
-%define gnome_desktop_version 2.32.1
-%define gnome_icon_theme_version 2.31.0
+%define glib2_version 2.28.6
+%define pango_version 1.28.4
+%define gtk3_version 3.0.0
+%define gconf2_version 2.32.2
+%define gnome_desktop3_version 3.0.0
+%define gnome_icon_theme_version 3.0.0
 %define desktop_file_utils_version 0.16
 
 Summary: Eye of GNOME image viewer
 Summary(ja): Eye of GNOME 画像ビューワ
 Name:    eog
-Version: 2.32.1
-Release: 2%{?_dist_release}
+Version: 3.1.4
+Release: 1%{?_dist_release}
 URL: http://projects.gnome.org/eog/
 Group: Applications/Graphics
 License: GPL 
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/2.32/%{name}-%{version}.tar.bz2
-Source1: eog-gnome-2-32-help-ja.po
-Source2: eog-gnome-2-32-help-ja-figures.tar.bz2
-Source3: eog.gnome-2-32.ja.po
-Patch0:	eog-2.32.1-fix-category.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/3.1/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post,postun): scrollkeeper
 Requires(post,pre,preun): GConf2
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: shared-mime-info >= 0.20
 BuildRequires: libexif-devel
 BuildRequires: libXt-devel
@@ -39,9 +35,14 @@ BuildRequires: lcms-devel
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: librsvg2-devel
+BuildRequires: libpeas-devel
 BuildRequires: python-devel, pygobject-devel, pygtk2-devel
 BuildRequires: docbook-dtds
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 Eye of GNOME (EOG) is an image viewer component used by Nautilus.
 
@@ -55,7 +56,7 @@ Summary(ja):    eog アプリケーションの開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:      pkgconfig
-Requires:      gtk2-devel
+Requires:      gtk3-devel
 Requires:      GConf2-devel
 
 %description devel
@@ -64,10 +65,6 @@ Header files and libraries for building a extension library for the eog.
 
 %prep
 %setup -q
-%patch0 -p1
-%{__cp} %{SOURCE1} help/ja/ja.po
-(cd help/ja && tar jxf %{SOURCE2})
-%{__cp} %{SOURCE3} po/ja.po
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -77,9 +74,10 @@ Header files and libraries for building a extension library for the eog.
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugings/*.la
 rm -fr $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/eog/plugins
@@ -96,55 +94,49 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-    %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /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/eog.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/eog.schemas >/dev/null || :
-fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     update-desktop-database -q &> /dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/gnome
+%{_bindir}/eog
+%{_libdir}/eog
+%{_datadir}/GConf/gsettings/eog.convert
 %{_datadir}/applications/*.desktop
-%{_datadir}/omf
 %{_datadir}/eog
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/gnome
 %{_datadir}/icons/hicolor/*/apps/*
-%{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_libdir}/eog
 
 %files devel
-%{_includedir}/eog-2.20
+%{_includedir}/eog-3.0
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- add BuildRequires: libpeas-devel
+- remove Source1,2
+- remove Patch0
+- fix %files
+
 * Thu Apr 07 2011 Yasumichi Akahoshi <yasumichi@vinelinux.org> 2.32.1-2
 - Add Source{1,2}(Update Japanese Translation)
 - Add Patch0(Fix category of help)

+ 41 - 34
e/epiphany/epiphany-vl.spec

@@ -3,20 +3,20 @@
 %define with_webkit 1
 
 %define gecko_version 1.9.1
-%define webkit_version 1.1.15
+%define webkit_version 1.4.2
 
 ExclusiveArch: %ix86 ppc x86_64 alpha
 
 Summary: GNOME web browser based on Gecko/WebKit
 Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
 Name: epiphany
-Version: 2.30.6
+Version: 3.1.3
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.30/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.1/%{name}-%{version}.tar.xz
 Patch1: epiphany-2.26.2-gecko191.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -32,10 +32,10 @@ Requires(post,postun): scrollkeeper, shared-mime-info
 BuildRequires: gecko-devel-unstable >= %{gecko_version}
 %endif
 %if %{with_webkit}
-BuildRequires: WebKit-gtk-devel >= %{webkit_version}
+BuildRequires: WebKit3-gtk-devel >= %{webkit_version}
 %endif
 BuildRequires: glib2-devel >= 2.24.0
-BuildRequires: gtk2-devel >= 2.20.0
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: libxml2-devel >= 2.6.12
 BuildRequires: libxslt-devel >= 1.1.7
 BuildRequires: libnotify-devel >= 0.4.0
@@ -54,6 +54,10 @@ BuildRequires: libgnome-keyring-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: seed-devel
+BuildRequires: gsettings-desktop-schemas
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -63,6 +67,18 @@ engine
 epiphany は Mozilla レンダリングエンジンベースのシンプルな GNOME
 ウェブブラウザです。
 
+%package devel
+Summary:        Epipany development environment
+Summary(ja):    Epipany の開発環境
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description devel
+Header files and libraries for building a extension library for the
+epipany.
+
+
 %prep
 %setup -q
 
@@ -101,31 +117,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/*/plugins/*.la
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="epiphany.schemas epiphany-lockdown.schemas"
-  for S in $SCHEMAS; do
-    gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$S > /dev/null
-  done
-fi
 
 %post
 touch --no-create %{_datadir}/icons/hicolor >& /dev/null ||:
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="epiphany.schemas epiphany-lockdown.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
-done
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="epiphany.schemas epiphany-lockdown.schemas"
-  for S in $SCHEMAS; do
-    gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$S > /dev/null
-  done
-fi
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -133,12 +127,14 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor >& /dev/null ||:
     update-desktop-database %{_datadir}/applications >& /dev/null ||:
     scrollkeeper-update >& /dev/null ||:
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor >& /dev/null ||:
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 scrollkeeper-update >& /dev/null ||:
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %clean
@@ -147,25 +143,36 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING* NEWS README
-%{_sysconfdir}/gconf/schemas/epiphany*.schemas
 %{_bindir}/epiphany
-%{_includedir}/epiphany/*
-%{_libdir}/pkgconfig/epiphany*.pc
-%{_libdir}/girepository-1.0/Epiphany-2.29.typelib
+%{_bindir}/ephy-profile-migrator
+%{_libdir}/girepository-1.0/*.typelib
 %if %{with_gecko}
 %{_libdir}/epiphany
 %endif
-%{_datadir}/gir-1.0/Epiphany-2.29.gir
 #{_datadir}/pygtk/*/defs/*
+%{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/applications/*.desktop
 %{_datadir}/epiphany
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/icons/*
-%{_datadir}/aclocal/*
 %{_datadir}/dbus-1/services/*
 %{_mandir}/man1/epiphany.1*
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/aclocal/*
+%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gtk-doc/html/*
+
+
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.3-1
+- new upstream release
+- add BuildRequires: gsettings-desktop-schemas
+- create -devel sub package
+
 * Sat Oct 09 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.6-1
 - new upstream release
 - remove BuildRequires: gir-repository-devel

+ 14 - 10
e/evince/evince-vl.spec

@@ -1,16 +1,16 @@
 Summary:	Document viewer
 Summary(ja): 	文書ビューワー
 Name:		evince
-Version:	2.32.0
-Release: 	2%{?_dist_release}
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/%{name}-%{version}.tar.bz2
+Version:	3.1.2
+Release: 	1%{?_dist_release}
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evince/3.1/%{name}-%{version}.tar.xz
 
 License:	GPL
 Group:		Applications/Publishing
 URL:		http://www.gnome.org/projects/evince/
 
-BuildRequires:	glib2-devel >= 2.26.0
-BuildRequires:	gtk2-devel >= 2.21.7
+BuildRequires:	glib2-devel >= 2.28.6
+BuildRequires:	gtk3-devel >= 3.0.0
 BuildRequires:  libgnome-keyring-devel >= 2.32.0
 BuildRequires:	gnome-doc-utils >= 0.20.0
 BuildRequires:	poppler-devel >= 0.14.0
@@ -32,6 +32,8 @@ Requires(postun): desktop-file-utils scrollkeeper
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Vendor: Project Vine
+Distribution: Vine Linux
 Packager:	daisuke, kazutaka, inagaki
 
 %description
@@ -169,21 +171,20 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/applications/evince.desktop
 %{_datadir}/evince
 %{_datadir}/gtk-doc/html/evince
-%{_datadir}/gtk-doc/html/libevdocument-2.32
-%{_datadir}/gtk-doc/html/libevview-2.32
+%{_datadir}/gtk-doc/html/libevdocument-3.0
+%{_datadir}/gtk-doc/html/libevview-3.0
 %{_datadir}/icons/hicolor/*/apps/evince.*
 %{_libdir}/evince/3/backends
 %exclude %{_libdir}/evince/3/backends/libdvidocument.so*
 %exclude %{_libdir}/evince/3/backends/dvidocument.evince-backend
 %{_libdir}/lib*.so.*
-%{_libdir}/nautilus/extensions-2.0/libevince-properties-page.*
-%{_libexecdir}/evince-convert-metadata
+%{_libdir}/nautilus/extensions-3.0/libevince-properties-page.*
 %{_libexecdir}/evinced
 %{_datadir}/dbus-1/services/*
-%{_sysconfdir}/gconf/schemas/evince*.schemas
 %{_mandir}/man1/evince.*
 %{_datadir}/GConf/gsettings/evince.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
+%{_datadir}/thumbnailers/evince.thumbnailer
 
 %files devel
 %{_includedir}/evince
@@ -196,6 +197,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+
 * Sat Mar 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.32.0-2
 - rebuilt with poppler-0.16.3
 

+ 47 - 79
e/evolution-data-server/evolution-data-server-vl.spec

@@ -4,52 +4,46 @@
 %define krb5_support 1
 %define nntp_support 1
 
-%define glib2_version 2.28.4
-%define gtk2_version 2.24.3
+%define glib2_version 2.28.6
+%define gtk3_version 3.0.9
 %define gtk_doc_version 1.14
 %define intltool_version 0.35.5
 %define orbit2_version 2.14.19
 %define soup_version 2.32.0
 %define libgweather_version 2.30.3
 %define libical_version 0.44
-%define libgdata_version 0.6.5
+%define libgdata_version 0.9.1
 
-%define eds_base_version 2.32
+%define eds_base_version 3.2
 %define eds_api_version 1.2
 
 %define use_gnome_keyring 1
 %define support_imap4_provider 0
 
-%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
-%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
-
-# Use stricter build settings than required by upstream.
-%define strict_build_settings 1
+%define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
+%define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
+%define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
 
 ### Abstract ###
 
 Summary: Backend data server for evolution
 Summary(ja): Evolution バックエンドデータサーバ
 Name: evolution-data-server
-Version: 2.32.3
+Version: 3.1.4
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/projects/evolution/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.1/%{name}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 ### Patches ###
 
-# RH bug #215702 / GNOME bug #487988
-Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
-
-# GNOME bug #373146
-Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
-
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch101: evolution-data-server-3.1.3-build-with-glib-2.29.14.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -65,6 +59,7 @@ BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel
+BuildRequires: gtk3-devel
 BuildRequires: gnutls-devel
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libsoup-devel >= %{soup_version}
@@ -75,7 +70,10 @@ BuildRequires: sqlite3-devel
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libical-devel >= %{libical_version}
 BuildRequires: gperf
+BuildRequires: krb5-devel
 BuildRequires: libgdata-devel >= %{libgdata_version}
+BuildRequires: gnome-online-accounts-devel
+BuildRequires: liboauth-devel
 
 %if %{use_nss}
 BuildRequires: nspr-devel
@@ -100,6 +98,9 @@ BuildRequires: krb5-devel
 #define krb5dir `pwd`/krb5-fakeprefix
 %endif
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The evolution-data-server package provides a unified backend for 
 programs that work with contacts, tasks, and calendar information.
@@ -135,9 +136,8 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -q
 
-## %patch10 -p1 -b .fix-ldap-query
-##%patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
+%patch101 -p1 -b .glib-2.29.14
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -202,29 +202,6 @@ fi
 
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
-%if ! %{use_nss}
-if pkg-config openssl ; then
-	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-%endif
-
-# Add stricter build settings here as the source code gets cleaned up.
-# We want to make sure things like compiler warnings and avoiding deprecated
-# functions in the GNOME/GTK+ libraries stay fixed.
-#
-# Please file a bug report at bugzilla.gnome.org if these settings break
-# compilation, and encourage the upstream developers to use them.
-
-%if %{strict_build_settings}
-CFLAGS="$CFLAGS \
-	-DG_DISABLE_DEPRECATED=1 \
-        -DPANGO_DISABLE_DEPRECATED=1 \
-	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
-	-DGDK_DISABLE_DEPRECATED=1 \
-	-Wdeclaration-after-statement \
-	-Werror-implicit-function-declaration"
-%endif
 
 # Regenerate configure to pick up configure.in and acinclude.m4 changes.
 aclocal -I m4
@@ -236,9 +213,6 @@ autoconf
 
 # See Ross Burton's blog entry for why we want --with-libdb.
 # http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
- 
-# need to build with gtk2-2.24.x
-sed -i -e "s:-DGTK_DISABLE_DEPRECATED::" configure
 
 %configure \
 	--with-libdb=/usr \
@@ -248,7 +222,8 @@ sed -i -e "s:-DGTK_DISABLE_DEPRECATED::" configure
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \
 	%keyring_flags
 export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+#make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -258,8 +233,9 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 # remove libtool archives for importers and the like
 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-%{eds_api_version}/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.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
 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -277,31 +253,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS AUTHORS
 %{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/*.typelib
 %{_libexecdir}/e-addressbook-factory
 %{_libexecdir}/e-calendar-factory
 %{_libexecdir}/camel-index-control-%{eds_api_version}
 %{_libexecdir}/camel-lock-helper-%{eds_api_version}
 %{_datadir}/evolution-data-server-%{eds_base_version}
-## %{_datadir}/idl/evolution-data-server-%{eds_api_version}
 %{_datadir}/pixmaps/evolution-data-server
-#{_libdir}/evolution-data-server-%{eds_api_version}
 %{_datadir}/dbus-1/services/*
 
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}
+%dir %{_libdir}/evolution-data-server
 %dir %{camel_provider_dir}
-%dir %{eds_extensions_dir}
+%dir %{ebook_backends_dir}
+%dir %{ecal_backends_dir}
 
 # Camel providers:
-%{camel_provider_dir}/libcamelgroupwise.so
-%{camel_provider_dir}/libcamelgroupwise.urls
-
 %{camel_provider_dir}/libcamelimap.so
 %{camel_provider_dir}/libcamelimap.urls
 
-%if %{support_imap4_provider}
-%{camel_provider_dir}/libcamelimap4.so
-%{camel_provider_dir}/libcamelimap4.urls
-%endif
+%{camel_provider_dir}/libcamelimapx.so
+%{camel_provider_dir}/libcamelimapx.urls
 
 %{camel_provider_dir}/libcamellocal.so
 %{camel_provider_dir}/libcamellocal.urls
@@ -318,29 +289,25 @@ rm -rf $RPM_BUILD_ROOT
 %{camel_provider_dir}/libcamelsmtp.so
 %{camel_provider_dir}/libcamelsmtp.urls
 
-%{camel_provider_dir}/libcamelimapx.so
-%{camel_provider_dir}/libcamelimapx.urls
-
 # e-d-s extensions:
-%{eds_extensions_dir}/libebookbackendfile.so
-%{eds_extensions_dir}/libebookbackendgoogle.so
-%{eds_extensions_dir}/libebookbackendgroupwise.so
-%{eds_extensions_dir}/libebookbackendldap.so
-%{eds_extensions_dir}/libebookbackendvcf.so
-%{eds_extensions_dir}/libebookbackendwebdav.so
-%{eds_extensions_dir}/libecalbackendcontacts.so
-%{eds_extensions_dir}/libecalbackendfile.so
-%{eds_extensions_dir}/libecalbackendgroupwise.so
-%{eds_extensions_dir}/libecalbackendhttp.so
-%{eds_extensions_dir}/libecalbackendweather.so
-%{eds_extensions_dir}/libecalbackendcaldav.so
-## %{eds_extensions_dir}/libecalbackendgoogle.so
+%{ebook_backends_dir}/libebookbackendfile.so
+%{ebook_backends_dir}/libebookbackendgoogle.so
+%{ebook_backends_dir}/libebookbackendldap.so
+%{ebook_backends_dir}/libebookbackendvcf.so
+%{ebook_backends_dir}/libebookbackendwebdav.so
+
+%{ecal_backends_dir}/libecalbackendcaldav.so
+%{ecal_backends_dir}/libecalbackendcontacts.so
+%{ecal_backends_dir}/libecalbackendfile.so
+%{ecal_backends_dir}/libecalbackendhttp.so
+%{ecal_backends_dir}/libecalbackendweather.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
 
 %files doc
 %defattr(-,root,root,-)
@@ -354,11 +321,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
-* Thu May 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.3-1
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
 - new upstream release
-
-* Wed Mar 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.2-2
-- rebuild with krb5-libs-1.8.2
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- BuildRequires: gnome-online-accounts-devel
+- add Patch101 (evolution-data-server-3.1.3-build-with-glib-2.29.14.patch)
+- fix %%files
 
 * Tue Feb 08 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.2-1
 - new upstream release

+ 87 - 31
e/evolution/evolution-vl.spec

@@ -1,23 +1,23 @@
 %define dbus_glib_version 0.88
 %define dbus_version 1.4.0
-%define eds_version 2.32.3
+%define eds_version 3.1.4
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.30.0
 %define gnome_pilot_version 2.0.13
 %define libxml2_version 2.7.6
-%define gtkhtml_version 3.30.0
+%define gtkhtml_version 4.0.0
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define orbit2_version 2.14.0
 %define pilot_link_version 2:0.12.1
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.32.0
-%define unique_version 1.1.6
+%define unique_version 2.90.4
 %define gstreamer_version 0.10.30
-%define gnome_desktop_version 2.32.0
+%define gnome_desktop3_version 2.91.3
 %define libgdata_version 0.4.0
 
-%define evo_major 2.32
+%define evo_major 3.2
 
 %define inline_audio_support 0
 %define ldap_support 1
@@ -36,12 +36,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.32.3
+Version: 3.1.4
 Release: 1%{?_dist_release}
 License: GPLv2 and GFDL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/projects/evolution/
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.32/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/3.1/%{name}-%{version}.tar.xz
 
 Summary: GNOME's next-generation groupware suite
 Summary(ja): GNOME 次世代グループウェアスイート
@@ -72,7 +72,7 @@ Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-vfs2 >= %{gnomevfs2_version}
 Requires: gnutls
-Requires: gtk2 >= 2.20.0
+Requires: gtk3 >= 3.0.0
 Requires: libsoup >= %{soup_version}
 
 %if %{libnotify_support}
@@ -101,7 +101,7 @@ BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+BuildRequires: gtkhtml4-devel >= %{gtkhtml_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
@@ -109,14 +109,15 @@ BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: pkgconfig
-BuildRequires: unique-devel >= %{unique_version}
-BuildRequires: libcanberra-devel
+BuildRequires: unique3-devel >= %{unique_version}
+BuildRequires: libcanberra-gtk3-devel
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: gstreamer-devel >= %{gstreamer_version}
 BuildRequires: gtkimageview-devel
 BuildRequires: libSM-devel
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: libgdata-devel >= %{libgdata_version}
+BuildRequires: gnome-online-accounts-devel
 BuildRequires: rarian-compat
 
 %if %{use_mozilla_nss}
@@ -154,6 +155,9 @@ BuildRequires: NetworkManager-glib-devel
 BuildRequires: libnotify-devel
 %endif
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
@@ -171,7 +175,7 @@ Summary: Development files for building against evolution
 Summary(ja): Evolution の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: gtkhtml3-devel >= %{gtkhtml_version}
+Requires: gtkhtml4-devel >= %{gtkhtml_version}
 Requires: libsoup-devel >= %{soup_version}
 
 %description devel
@@ -321,6 +325,7 @@ sed -i -e "s:-DGTK_DISABLE_DEPRECATED::" configure
   --with-kde-applnk-path=no \
   %ldap_flags %pilot_flags %krb5_flags %ssl_flags \
   --disable-pst-import \
+  --disable-image-inline \
   --enable-plugins=all
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing"
@@ -378,14 +383,50 @@ SCHEMAS="apps-evolution-mail-notification.schemas \
 	 apps_evolution_shell.schemas \
 	 evolution-mail.schemas \
 	 apps-evolution-template-placeholders.schemas \
-	 apps_evolution_email_custom_header.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/bogo-junk-plugin.schemas > /dev/null
+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
 /sbin/ldconfig
@@ -409,6 +450,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
 
 # The main executable
@@ -427,7 +469,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/24x24/apps/*
 %{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
+%{_datadir}/icons/hicolor/256x256/apps/*
+#%{_datadir}/icons/hicolor/scalable/apps/*
 
 # The main data directory
 # (have not attempted to split this up into an explicit list)
@@ -437,7 +480,9 @@ rm -rf $RPM_BUILD_ROOT
 # Modules:
 %dir %{_libdir}/evolution
 %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
 
 # Shared libraries:
 %{_libdir}/evolution/%{evo_major}/lib*.so.*
@@ -504,12 +549,12 @@ rm -rf $RPM_BUILD_ROOT
 ##%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 ##%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
-%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
-%{evo_plugin_dir}/org-gnome-compose-send-options.xml
+#%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
+#%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
+#%{evo_plugin_dir}/org-gnome-compose-send-options.xml
 
-%{evo_plugin_dir}/org-gnome-image-inline.eplug
-%{evo_plugin_dir}/liborg-gnome-image-inline.so
+#%{evo_plugin_dir}/org-gnome-image-inline.eplug
+#%{evo_plugin_dir}/liborg-gnome-image-inline.so
 
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so
@@ -529,8 +574,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
 
-%{evo_plugin_dir}/org-gnome-plugin-manager.eplug
-%{evo_plugin_dir}/liborg-gnome-plugin-manager.so
+#%{evo_plugin_dir}/org-gnome-plugin-manager.eplug
+#%{evo_plugin_dir}/liborg-gnome-plugin-manager.so
 
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
@@ -541,8 +586,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
-%{evo_plugin_dir}/org-gnome-subject-thread.eplug
-%{evo_plugin_dir}/liborg-gnome-subject-thread.so
+#%{evo_plugin_dir}/org-gnome-subject-thread.eplug
+#%{evo_plugin_dir}/liborg-gnome-subject-thread.so
 
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
@@ -556,6 +601,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-dbx-import.eplug
 %{evo_plugin_dir}/liborg-gnome-dbx-import.so
 
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+
 %files devel
 %defattr(-, root, root)
 %{_includedir}/evolution-%{evo_major}
@@ -584,16 +632,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files bogofilter
 %defattr(-, root, root)
-%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
-%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
-%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-bogofilter.so
+%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas
 
 %files spamassassin
 %defattr(-, root, root)
-%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
-%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
+%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-spamassassin.so
+%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change BuildRequires: gtkhtml4-devel instead of gtkhtml3-devel
+- add BuildRequires: gnome-online-accounts-devel
+- add configure option: --disable-image-inline
+
 * Thu May 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.3-1
 - new upstream release
 

+ 16 - 7
f/farsight2/farsight2-vl.spec

@@ -1,13 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gst_ver 0.10.23
-%define gst_plugins_base_ver 0.10.23
-%define gst_plugins_good 0.10.7
+%define gst_ver 0.10.35
+%define gst_plugins_base_ver 0.10.35
+%define gst_plugins_good 0.10.30
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.17
-Release:        2%{?_dist_release}
+Version:        0.0.29
+Release:        1%{?_dist_release}
 Summary:        Libraries for videoconferencing
 Summary(ja):    ビデオ会議のためのライブラリ
 
@@ -20,7 +20,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	glib2-devel >= 2.14
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
-BuildRequires:	gstreamer-python >= %{gst_python}
+BuildRequires:	gstreamer-python-devel >= %{gst_python}
 BuildRequires:	libnice-devel >= 0.0.9
 BuildRequires:	gupnp-devel
 BuildRequires:	gupnp-igd-devel
@@ -29,6 +29,8 @@ BuildRequires:	pygobject-devel
 
 Requires:	gstreamer-plugins-good >= %{gst_plugins_good}
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 %{name} is a collection of GStreamer modules and libraries for
@@ -90,13 +92,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}-0.0
 %{_libdir}/%{name}-0.0/libmulticast-transmitter.so
-%{_libdir}/%{name}-0.0/librawudp-transmitter.so
 %{_libdir}/%{name}-0.0/libnice-transmitter.so
+%{_libdir}/%{name}-0.0/librawudp-transmitter.so
+%{_libdir}/%{name}-0.0/libshm-transmitter.so
 %{_libdir}/gstreamer-0.10/libfsfunnel.so
 %{_libdir}/gstreamer-0.10/libfsrtpconference.so
 %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
 %{_libdir}/gstreamer-0.10/libfsrtcpfilter.so
 %{_libdir}/gstreamer-0.10/libfsmsnconference.so
+%{_libdir}/gstreamer-0.10/libfsrawconference.so
+%{_datadir}/farsight2/0.0/fsrtpconference
 
 %files python
 %defattr(-,root,root,-)
@@ -112,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.29-1
+- new upstream release
+- change BuildRequires: gstreamer-python-devel instead of gstreamer-python
+
 * Sat Oct 02 2010 Shu KONNO <owa@bg.wakwak.com> 0.0.17-2
 - rebuilt with rpm-4.8.1 for pkg-config
 - added BR: gupnp-devel

+ 27 - 41
f/file-roller/file-roller-vl.spec

@@ -1,27 +1,23 @@
 %define glib2_version 2.28.6
-%define gtk2_version 2.24.4
-%define gconf2_version 2.32.1
-%define nautilus_version 2.32.1
+%define gtk3_version 3.0.9
+%define gconf2_version 2.32.2
+%define nautilus_version 3.0.1
 %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(ja):    File Roller - アーカイブの表示・作成ツール
 Name:		file-roller
-Version:	2.32.2
-Release:        2%{?_dist_release}
+Version:	3.1.1
+Release:        1%{?_dist_release}
 
 License:	GPL
 Group:		Applications/Archiving
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.32/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.1/%{name}-%{version}.tar.xz
 Source1:	file-roller.help.Makefile.am
 Source2:	file-roller.help.gnome-2-30.ja.po
 Source3:	file-roller-ja-figures.tar.bz2
-Source4:	file-roller-2.32.2-ja.po
-# i18n fix for ui strings
-# refer https://bugzilla.gnome.org/show_bug.cgi?id=649159
-# and also http://git.gnome.org/browse/file-roller/commit/src/ui.h?id=c5f7cb8dab9740ff10b46c2dc9a2d2970b2f7cfe
-Patch1:		file-roller-2.32.2-i18n-fix.patch
+Source4:	file-roller.gnome-2-30.ja.po
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -30,7 +26,7 @@ Requires(post,postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post,pre,preun): GConf2
 
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
@@ -39,6 +35,10 @@ BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: libSM-devel
 BuildRequires: docbook-dtds
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 File Roller is an application for creating and viewing archives files, 
 such as tar files.
@@ -49,7 +49,6 @@ File Roller は tar ファイルのようなアーカイブの表示や作成を
 
 %prep
 %setup -q
-%patch1 -p1 -b .i18n-fix
 
 ## # add Japanese help
 ## cp -f %{SOURCE1} help/Makefile.am
@@ -85,7 +84,7 @@ desktop-file-install --vendor gnome --delete-original       \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.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
 
@@ -97,29 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 scrollkeeper-update > /dev/null 2>&1 || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule   \
-    %{_sysconfdir}/gconf/schemas/file-roller.schemas > /dev/null
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule   \
-      %{_sysconfdir}/gconf/schemas/file-roller.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/file-roller.schemas > /dev/null
-fi
-
 %postun
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 scrollkeeper-update > /dev/null 2>&1 || :
@@ -127,24 +109,28 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING ChangeLog NEWS AUTHORS
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_bindir}/*
-%{_datadir}/applications/*
+%{_bindir}/file-roller
+%{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
+%{_libexecdir}/file-roller/*
+%{_libexecdir}/file-roller-server
+%{_datadir}/GConf/gsettings/file-roller.convert
+%{_datadir}/applications/gnome-file-roller.desktop
+%{_datadir}/dbus-1/services/org.gnome.FileRoller.service
 %{_datadir}/file-roller
+%{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
 %{_datadir}/icons/hicolor/*
-%{_libexecdir}/file-roller
-%{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.so
 
 %changelog
-* Fri Jul 15 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 2.32.2-2
-- add Patch1 to fix non-translatable string
-- update Source4: file-roller-2-32.2-ja.po
-
-* Thu May 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.2-1
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.1-1
 - new upstream release
 
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1

+ 18 - 9
f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 ## do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 5.0
-%global geckomajor 5.0
-%global ffminor 1
-%global ffversion %{ffmajor}.%{ffminor}
+%global ffmajor 6.0
+%global geckomajor 6.0
+#global ffminor 1
+%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox-%{ffmajor}
 %global langpackdir %{ffdir}/langpacks
 %define tarballdir mozilla-release
@@ -14,7 +14,7 @@
 %define build_vine5 0
 
 # current firefox3 doesn't build on Vine Linux 4.x or older.
-%if "%{?_dist_release}" == "vl6"
+%if "%{?_dist_release}" >= "vl6"
 %define build_vine6 1
 %define build_vine5 1
 %endif
@@ -22,14 +22,14 @@
 %define build_vine5 1
 %endif
 
-%define ffrelease 1%{?_dist_release}
+%define ffrelease 2%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.8.7
 %define nss_version 3.12.9
 %define cairo_version 1.10.2-2
 %define libjpeg-turbo_version 1.1.0
-#define gecko_version %{geckomajor}.%{ffminor}
+#define gecko_version %{geckomajor}%{?ffminor:.%{ffminor}}
 %define gecko_version %{geckomajor}
 
 ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc s390 s390x
@@ -51,8 +51,8 @@ License:        MPL/LGPL
 Group:          Applications/Internet
 Source0:        firefox-%{version}.source.tar.bz2
 
-Source220:       mozconfig-firefox5-vine5
-Source230:       mozconfig-firefox5-vine6
+Source220:       mozconfig-firefox-vine5
+Source230:       mozconfig-firefox-vine6
 
 Source11:       firefox-vine-default-bookmarks.html
 Source12:       firefox-vine-default-prefs.js
@@ -140,6 +140,9 @@ Provides:       webclient
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Fx Browser is an open-source web browser based on mozilla technology.
 This is unofficial build of firefox browser.
@@ -382,6 +385,12 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.0-2
+- rebuild with libnotify-0.7
+
+* Sun Aug 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 6.0-1
+- update to 6.0
+
 * Tue Jul 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 5.0.1-1
 - update to 5.0.1
 

+ 15 - 4
f/folks/folks-vl.spec

@@ -1,23 +1,27 @@
-%define tp_glib_ver	0.13.0
+%define tp_glib_ver	0.14.0
 
 Name:           folks
-Version:        0.2.0
+Version:        0.5.2
 Release:        1%{?_dist_release}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Folks
-Source0:        http://download.gnome.org/sources/folks/0.2/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/folks/0.5/%{name}-%{version}.tar.xz
 
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala >= %{tp_glib_ver}
 BuildRequires:  glib2-devel
+BuildRequires:  GConf2-devel
 BuildRequires:  libgee-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  vala-devel
 BuildRequires:  vala-tools
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 libfolks is a library that aggregates people from multiple sources (e.g. 
 Telepathy connection managers and eventually evolution data server, 
@@ -50,18 +54,20 @@ make %{?_smp_mflags} V=1
 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
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}-import
 %{_libdir}/*.so.*
 %{_libdir}/folks
+%{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/vala/vapi/%{name}*
 
 %files devel
@@ -69,9 +75,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_includedir}/folks
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/folks*.pc
+%{_datadir}/gir-1.0/*.gir
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.2-1
+- new upstream release
+- add BuildRequires: GConf2-devel
+
 * Sun Oct 10 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.0-1
 - initial build for Vine Linux
 

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

@@ -1,14 +1,14 @@
 Name: gcalctool
-Version: 5.32.2
+Version: 6.1.3
 Release: 1%{?_dist_release}
 Summary: Gnome2 Calculator application
 Summary(ja): GNOME2 電卓アプリケーション
 Group: Applications/Productivity
 License: GPL
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gcalctool/6.1/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel >= 2.8.0
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -19,6 +19,10 @@ BuildRequires: desktop-file-utils
 Requires(post,postun): scrollkeeper
 Requires(post,pre,preun): GConf2
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 gcalctool is a calculator application based on Gtk2.
   
@@ -72,11 +76,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml
 
 %changelog
-* Sat Dec 18 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.32.2-1
-- new upstream release
-
-* Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.32.1-1
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.1.3-1
 - new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
 
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.32.0-1
 - new upstream release

+ 12 - 4
g/gconf-editor/gconf-editor-vl.spec

@@ -1,4 +1,4 @@
-%define gtk2_version 2.22.0
+%define gtk3_version 3.0.0
 %define gconf2_version 2.32.0
 %define desktop_file_utils_version 0.16
 %define gnome_doc_utils_version 0.20.1
@@ -6,10 +6,10 @@
 Summary: Editor/admin tool for GConf
 Summary(ja): GConf の編集/管理ツール
 Name: gconf-editor
-Version: 2.32.0
+Version: 3.0.0
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/3.0/%{name}-%{version}.tar.bz2
 Patch10: gconf-editor-2.14.0-fix-incorrect-g_free.patch
 License: GPL
 Group: Applications/System
@@ -18,13 +18,17 @@ BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,pre,preun): GConf2
 Requires(post): scrollkeeper
 
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: docbook-utils
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 gconf-editor allows you to browse and modify GConf configuration 
 sources.
@@ -93,6 +97,10 @@ scrollkeeper-update > /dev/null 2>&1 || :
 %{_mandir}/man1/*
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 

+ 9 - 2
g/gdk-pixbuf2/gdk-pixbuf2-vl.spec

@@ -8,14 +8,14 @@
 %endif
 
 Name:           gdk-pixbuf2
-Version:        2.22.1
+Version:        2.23.5
 Release:        1%{?_dist_release}
 Summary:        An image loading library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gt.org
-Source0:        http://download.gnome.org/sources/gdk-pixbuf/2.22/gdk-pixbuf-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-%{version}.tar.xz
 
 BuildRequires:  glib2-devel >= 2.26.0
 BuildRequires:  libpng-devel
@@ -43,6 +43,10 @@ Conflicts: gtk2 <= 2.21.2
 # https://bugzilla.gnome.org/show_bug.cgi?id=624712
 Patch0: 0001-Fix-linking-when-libpng-loader-is-builtin.patch
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 gdk-pixbuf is an image loading library that can be extended by loadable
 modules for new image formats. It is used by toolkits such as GTK+ or
@@ -197,6 +201,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.23.5-1
+- new upstream release
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.1-1
 - new upstream release
 

+ 16 - 10
g/gdl/gdl-vl.spec

@@ -1,22 +1,23 @@
-Version:	2.30.1
+Version:	3.1.4
 Release:	1%{?_dist_release}
 
 Name:		gdl
 Summary:	Gnome Docking library
 License:	LGPL
 Group:		Development/Libraries
-Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/2.30/%{name}-%{version}.tar.bz2
+Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/3.1/%{name}-%{version}.tar.xz
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 URL:		http://www.gnome.org/
 Summary(ja):	GNOMEドッキングライブラリ
 
-Requires: 	gtk2 >= 2.12.0
+Requires: 	gtk3 >= 3.0.0
 #Requires: 	libgnomeui >= 2.6.0
 Requires: 	libxml2 >= 2.2.8
 #Requires: 	libglade2 >= 2.0.0
 
-BuildRequires: 	gtk2-devel >= 2.12.0
+BuildRequires: 	gtk3-devel >= 3.0.0
 BuildRequires: 	libxml2-devel >= 2.2.8
+BuildRequires: 	gobject-introspection-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -77,20 +78,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %doc AUTHORS COPYING ChangeLog NEWS README
 %defattr (-, root, root)
 %{_libdir}/lib*.so.*
-%{_prefix}/share/gdl
-%{_prefix}/share/locale/*/LC_MESSAGES/*
-%{_prefix}/share/gtk-doc/html/gdl
+%{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/gdl-3
+%{_datadir}/locale/*/LC_MESSAGES/*
+%{_datadir}/gtk-doc/html/gdl-3.0
 
 
 %files devel
 %defattr (-, root, root)
-%{_prefix}/include/libgdl-1.0
-#%{_prefix}/lib/lib*.a
-#%{_libdir}/lib*.la
+%{_prefix}/include/libgdl-3.0
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- add BuildRequires: gobject-introspection-devel
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.1-1
 - new upstream release.
 

+ 274 - 200
g/gdm/gdm-vl.spec

@@ -1,51 +1,111 @@
-%define pango_version 1.22.0
-%define gtk2_version 2.14.0
-%define libglade2_version 2.6.0
-%define librsvg2_version 2.22.0
-%define libxml2_version 2.5.10
-%define rarian 0.8
-%define pam_version 0.99.8
-%define desktop_file_utils_version 0.3
-%define gail_version 1.18.0
-%define consolekit_version 0.2.7
-%define hal_version 0.5.9
-
-Summary: The GNOME Display Manager.
+%define libauditver 1.0.6
+%define pango_version 1.2.0
+%define gtk3_version 2.99.2
+%define libglade2_version 2.0.0
+%define libgnomeui_version 2.2.0
+%define scrollkeeper_version 0.3.4
+%define pam_version 0.99.8.1-11
+%define desktop_file_utils_version 0.2.90
+%define gail_version 1.2.0
+%define nss_version 3.11.1
+%define consolekit_version 0.3.0-9
+%define fontconfig_version 2.6.0
+
+%define _default_patch_fuzz 999
+
+Summary: The GNOME Display Manager
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
-Version: 2.32.2
-Release: 6%{?_dist_release}
-License: LGPL/GPL
+Version: 3.1.2
+Release: 1%{?_dist_release}
+License: GPLv2+
 Group: User Interface/X
-URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
+URL: http://download.gnome.org/sources/gdm
 
-Source: %{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gdm/2.91/gdm-%{version}.tar.xz
 Source1: gdm-pam
 Source2: gdm-autologin-pam
-Source10: polkit-gnome-authentication-agent-1.desktop
-
-Source110: gnome.desktop
-Source130: gdm-2.32.2-ja.po
+Source3: gdm-welcome-pam
+Source4: gdm-password.pam
+Source5: gdm-smartcard.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
 
 Source200: gdm-restart
 Source201: gdm-safe-restart
 Source202: gdm-stop
+Source203: gnome.desktop
+
+Source210: gdm.master.ja.po
+
+
+Requires(pre): shadow-utils
+Requires: pam >= %{pam_version}
+Requires: ConsoleKit >= %{consolekit_version}
+Requires: accountsservice
+Requires: iso-codes
+Requires: gnome-keyring-pam
+Requires: gnome-session
+Requires: gnome-settings-daemon
+Requires: polkit-gnome
+Requires: pulseaudio-gdm-hooks
+Requires: usermode-gtk
+Requires: util-linux
+Requires: xinitrc
+Requires: xorg-x11-xdm
+Requires: vine-backgrounds >= 4.0
+Requires: libXau >= 1.0.4-4
+Requires: audit-libs >= %{libauditver}
+
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: scrollkeeper >= %{scrollkeeper_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: pam-devel >= %{pam_version}
+BuildRequires: fontconfig >= %{fontconfig_version}
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: libtool automake autoconf
+BuildRequires: libattr-devel
+BuildRequires: gettext
+BuildRequires: gnome-doc-utils
+BuildRequires: libdmx-devel
+BuildRequires: audit-libs-devel >= %{libauditver}
+BuildRequires: autoconf automake libtool
+BuildRequires: intltool
+BuildRequires: xorg-x11-server-Xorg
+BuildRequires: nss-devel >= %{nss_version}
+BuildRequires: ConsoleKit
+BuildRequires: check-devel
+BuildRequires: iso-codes
+BuildRequires: libxklavier-devel >= 4.0
+BuildRequires: upower-devel >= 0.9.7
+BuildRequires: libXdmcp-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: GConf2-devel
+BuildRequires: accountsservice-devel
+
+# these are all just for rebuilding dconf-override-db
+BuildRequires: dbus-x11
+BuildRequires: dconf
+BuildRequires: gnome-power-manager
+BuildRequires: gsettings-desktop-schemas
+BuildRequires: gnome-settings-daemon
+
+
+# Patch from Fedora
+Patch0: fix-build.patch
+Patch1: disable-fatal-criticals.patch
+Patch2: 0001-welcome-register-in-PAM-in-addition-to-ConsoleKit.patch
 
-## patches from fedora
-# Fedora-specific
-Patch97: gdm-bubble-location.patch
-Patch98: tray-padding.patch
+Patch98: plymouth.patch
 
-## patches from ubuntu
-Patch102: 02_x_server_location.patch
+# Patch from Ubuntu
 Patch105: 05_initial_server_on_vt7.patch
-Patch108: 08_use_polkit_for_settings.patch
-Patch117: 17_use_timed_login_after_autologin.patch
-Patch127: 27_save_root_window.patch
-Patch128: 28_plymouth_transition.patch
-Patch132: 32-hide-mouse-cursor.patch
 Patch134: 34_disable_a11y_default.patch
-Patch138: 38_user_chooser_focus.patch
 
 ## patches for vine
 Patch500: gdm-2.32.1-vine-release.patch
@@ -54,120 +114,91 @@ Patch500: gdm-2.32.1-vine-release.patch
 ## http://git.gnome.org/browse/gdm/commit/?h=gnome-2-28&id=98a1649b17320957b9a2521af07d15ba51c187c9
 Patch501: gdm-2.32.0-greeter-login-window-be-dock.patch
 
-# add translatable tag
-Patch502: gdm-2.32.2-simple-greeter-vine.patch
-
 # disable metacity compositing_manager on gdm
 Patch503: gdm-2.32.2-disable-metacity-compositing_manager.patch
 
 # use start-here logo (distro logo) on simple greeter panel instead of computer
 Patch504: gdm-2.32.2-simple-greeter-logo.patch
 
-# fix login dialog focus problem
-# re-enable upstream change.
-# http://git.gnome.org/browse/gdm/commit/?id=bc78b6c7fc40a6388ddb194461b7b5d140acd8d0
-Patch505: gdm-2.32.2-fix-login-dialog-focus.patch
+Vendor: Project Vine
+Distribution: Vine Linux
 
-# security fix
 
+%description
+GDM provides the graphical login screen, shown shortly after boot up,
+log out, and when user-switching.
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%package plugin-smartcard
+Summary:   GDM smartcard plugin
+Group:     User Interface/Desktops
+Requires:  gdm = %{version}-%{release}
+Requires:  pam_pkcs11
 
-Requires(pre): shadow-utils
-Requires: pam >= %{pam_version}
-Requires: hal >= %{hal_version}
-Requires: ConsoleKit >= %{consolekit_version}
-Requires: usermode-gtk
-Requires: xinitrc
-Requires: xorg-x11-xdm
-Requires: util-linux
-Requires: vine-backgrounds >= 4.0
-Requires: gnome-settings-daemon
-Requires: polkit-gnome
-Requires: iso-codes
-Requires: gnome-session
-Requires: gnome-keyring-pam
-BuildRequires: scrollkeeper >= %{scrollkeeper_version}
-BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: librsvg2-devel >= %{librsvg2_version}
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: usermode
-BuildRequires: pam-devel >= %{pam_version}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: libtool, automake, autoconf
-BuildRequires: ConsoleKit
-BuildRequires: libdmx-devel, audit-libs-devel
-BuildRequires: libcanberra-devel
-BuildRequires: polkit-devel
-BuildRequires: gnome-panel-devel
-BuildRequires: libxklavier-devel
-BuildRequires: upower-devel
-BuildRequires: libXdmcp-devel
-BuildRequires: check-devel
-BuildRequires: libICE-devel
-BuildRequires: gnome-doc-utils
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+%description plugin-smartcard
+The GDM smartcard plugin provides functionality necessary to use a smart card with GDM.
 
-%description
-Gdm (the GNOME Display Manager) is a highly configurable
-reimplementation of xdm, the X Display Manager. Gdm allows you to log
-into your system with the X Window System running and supports running
-several different X sessions on your local machine at the same time.
+%package plugin-fingerprint
+Summary:   GDM fingerprint plugin
+Group:     User Interface/Desktops
+Requires:  gdm = %{version}-%{release}
+Requires:  fprintd-pam
 
-%prep
-%setup -q
+%description plugin-fingerprint
+The GDM fingerprint plugin provides functionality necessary to use a fingerprint reader with GDM.
 
-cp -f %{SOURCE130} po/ja.po
 
-%patch97 -p1 -b .bubble-location
-%patch98 -p1 -b .tray-padding
+%prep
+%setup -q
+%patch0 -p1 -b .fix-build
+%patch1 -p1 -b .disable-fatal-criticals
+%patch2 -p1 -b .welcome-pam
+%patch98 -p1 -b .plymouth
 
-%patch102 -p1 -b .force-vt7
 %patch105 -p1 -b .xserver
-%patch108 -p1 -b .polkit
-%patch117 -p1 -b .use_timed_login_after_autologin
-%patch127 -p1 -b .slave_save_root_window
-%patch128 -p1 -b .plymouth
-%patch132 -p1 -b .hide-mouse-cursor
 %patch134 -p1 -b .disable_a11y_default
-%patch138 -p1 -b .user_chooser_focus
 
 %patch500 -p1 -b .vine-release
 %patch501 -p1 -b .greeter-login-window-be-dock
-%patch502 -p1 -b .greeter-vine
 %patch503 -p1 -b .disable-metacity-compositing_manager
 %patch504 -p1 -b .simple-greeter-logo
-%patch505 -p1 -b .fix-login-dialog-focus
 
-cp -f %{SOURCE1} data/gdm
-cp -f %{SOURCE2} data/gdm-autologin
-
-%build
+cp -f %{SOURCE210} po/ja.po
 
 autoreconf -i -f
-%configure --with-sysconfsubdir=X11/gdm \
-	   --with-dmconfdir=%{_sysconfdir}/X11/dm \
-           --with-pam-prefix=%{_sysconfdir} \
-           --with-working-directory=%{_localstatedir}/gdm \
-	   --enable-console-helper \
-	   --disable-scrollkeeper \
-	   --with-console-kit \
-	   --without-selinux
+
+# force regeneration
+rm data/dconf-override-db
+
+%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
+
+%configure \
+        --with-pam-prefix=%{_sysconfdir} \
+        --with-working-directory=%{_localstatedir}/gdm \
+        --enable-console-helper \
+        --disable-scrollkeeper \
+        --with-console-kit \
+        --enable-split-authentication=yes \
+        --without-selinux
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \
-       -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+make -C po
 
-%__make -C po
+make %{?_smp_mflags}
 
-%__make %{?_smp_mflags}
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -187,20 +218,14 @@ mkdir -p $RPM_BUILD_ROOT/var/log/gdm
 # and a spool dir
 mkdir -p $RPM_BUILD_ROOT/var/spool/gdm
 
-# change default Init script for :0 to be Vine Linux default
-#ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/:0
-
 # remove the gdm Xsession as we're using the xdm one
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .)
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Xsession
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/gdm; ln -sf ../X11/xinit/Xsession .)
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
 
 # temporarily manually copy this
-cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
+cp -f %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter
 
@@ -209,26 +234,18 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 find $RPM_BUILD_ROOT -name '*.a' -delete
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-greeter-extension.h
+rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
 
-%find_lang gdm --with-gnome
-
-# install Vine Theme
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
-#tar xzvf %{SOURCE100} -C $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
 
+install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
 # install gnome.desktop
 # XXX: this should be included in each desktop environment package.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-cp %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-
-install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
+cp %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
-%find_lang gdm
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%find_lang gdm --with-gnome
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -246,26 +263,22 @@ exit 0
 
 %post
 /sbin/ldconfig
-scrollkeeper-update >& /dev/null ||:
-
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
 
+touch --no-create /usr/share/icons/hicolor >&/dev/null || :
+
 # if the user already has a config file, then migrate it to the new
 # location; rpm will ensure that old file will be renamed
 
-custom=/etc/X11/gdm/custom.conf
+custom=%{_sysconfdir}/gdm/custom.conf
 
 if [ $1 -ge 2 ] ; then
     if [ -f /usr/share/gdm/config/gdm.conf-custom ]; then
-	oldconffile=/usr/share/gdm/config/gdm.conf-custom
+        oldconffile=/usr/share/gdm/config/gdm.conf-custom
     elif [ -f /etc/X11/gdm/gdm.conf ]; then
-	oldconffile=/etc/X11/gdm/gdm.conf
+        oldconffile=/etc/X11/gdm/gdm.conf
     fi
 
     # Comment out some entries from the custom config file that may
@@ -274,13 +287,14 @@ if [ $1 -ge 2 ] ; then
 
     [ -n "$oldconffile" ] && sed \
     -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' \
-    -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/bin/Xnest@' \
-    -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xdm/Xsession@' \
+    -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' \
+    -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' \
+    -e 's@^BaseXsession=/etc/X11/gdm/Xsession@#&@' \
     -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' \
     -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' \
     -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' \
-    -e 's@^GraphicalTheme=Vine@#&@' \
-    -e 's@^BackgroundColor=#27408b@#&@' \
+    -e 's@^GraphicalTheme=Bluecurve@#&@' \
+    -e 's@^BackgroundColor=#20305a@#&@' \
     -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' \
     -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' \
     -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' \
@@ -298,8 +312,9 @@ if [ $1 -ge 2 ] ; then
     $oldconffile > $custom
 fi
 
-/usr/sbin/gdm-safe-restart >/dev/null 2>&1 || :
-exit 0
+if [ $1 -ge 2 -a -f $custom ] && grep -q /etc/X11/gdm $custom ; then
+   sed -i -e 's@/etc/X11/gdm@/etc/gdm@g' $custom
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -310,67 +325,125 @@ fi
 %postun
 /sbin/ldconfig
 scrollkeeper-update >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor ||:
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files -f gdm.lang
 %defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
-
-%dir %{_sysconfdir}/X11/gdm
-# Not sure which package %{_sysconfdir}/X11/dm dir should belong to,
-# this dir was agreed on among KDM and GDM maintainer to host
-# the new session setup
-%config %{_sysconfdir}/X11/dm/Sessions/*
-%config(noreplace) %{_sysconfdir}/X11/gdm/custom.conf
-%config %{_sysconfdir}/X11/gdm/Init/*
-%config %{_sysconfdir}/X11/gdm/PostLogin/*
-%config %{_sysconfdir}/X11/gdm/PreSession/*
-%config %{_sysconfdir}/X11/gdm/PostSession/*
+%doc AUTHORS COPYING NEWS README TODO
+%dir %{_sysconfdir}/gdm
+%config(noreplace) %{_sysconfdir}/gdm/custom.conf
+%config %{_sysconfdir}/gdm/Init/*
+%config %{_sysconfdir}/gdm/PostLogin/*
+%config %{_sysconfdir}/gdm/PreSession/*
+%config %{_sysconfdir}/gdm/PostSession/*
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdm-autologin
-%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
-%dir %{_sysconfdir}/X11/gdm/Init
-%dir %{_sysconfdir}/X11/gdm/PreSession
-%dir %{_sysconfdir}/X11/gdm/PostSession
-%dir %{_sysconfdir}/X11/gdm/PostLogin
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_sysconfdir}/X11/gdm/Xsession
+%config %{_sysconfdir}/pam.d/gdm-password
+%config %{_sysconfdir}/pam.d/gdm-welcome
+# not config files
+%{_sysconfdir}/gdm/Xsession
+%{_datadir}/gdm/gdm.schemas
+%{_sysconfdir}/X11/dm/Sessions/gnome.desktop
+%{_sysconfdir}/dbus-1/system.d/gdm.conf
+%dir %{_sysconfdir}/gdm/Init
+%dir %{_sysconfdir}/gdm/PreSession
+%dir %{_sysconfdir}/gdm/PostSession
+%dir %{_sysconfdir}/gdm/PostLogin
+%{_datadir}/gnome-session/sessions/gdm.session
 %{_datadir}/pixmaps/*.png
-%dir %{_datadir}/pixmaps/faces
-%{_datadir}/pixmaps/faces/*.png
-%{_datadir}/pixmaps/faces/*.jpg
 %{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.fingerprint.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.smartcard.gschema.xml
+%{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
+%{_libexecdir}/gdm-factory-slave
+%{_libexecdir}/gdm-host-chooser
+%{_libexecdir}/gdm-product-slave
+%{_libexecdir}/gdm-session-worker
+%{_libexecdir}/gdm-simple-chooser
+%{_libexecdir}/gdm-simple-greeter
+%{_libexecdir}/gdm-simple-slave
+%{_libexecdir}/gdm-xdmcp-chooser-slave
+%{_sbindir}/gdm
+%{_sbindir}/gdm-binary
+%{_sbindir}/gdm-restart
+%{_sbindir}/gdm-safe-restart
+%{_sbindir}/gdm-stop
+%{_bindir}/gdmflexiserver
+%{_bindir}/gdm-screenshot
+%{_datadir}/gdm/*.ui
+%{_datadir}/gdm/locale.alias
+%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/gdm/gdb-cmd
+%{_libexecdir}/gdm-crash-logger
+%{_libdir}/libgdm*.so*
+%dir %{_libdir}/gdm
+%dir %{_libdir}/gdm/simple-greeter
+%dir %{_libdir}/gdm/simple-greeter/extensions
+%{_libdir}/gdm/simple-greeter/extensions/libpassword.so
+%dir %{_datadir}/gdm/simple-greeter
+%dir %{_datadir}/gdm/simple-greeter/extensions
+%dir %{_datadir}/gdm/simple-greeter/extensions/password
+%{_datadir}/gdm/simple-greeter/extensions/password/page.ui
 %dir %{_datadir}/gdm
-%{_datadir}/gdm/*
-%{_datadir}/gnome/help/gdm
-%{_datadir}/omf/gdm
-%{_datadir}/polkit-1/actions/gdm.policy
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
-%{_bindir}/*
-%{_libexecdir}/*
-%{_sbindir}/*
-%dir %{_var}/log/gdm
-%dir %{_var}/spool/gdm
-
+%dir %{_datadir}/gdm/autostart
+%dir %{_datadir}/gdm/autostart/LoginWindow
+%{_datadir}/gdm/autostart/LoginWindow/*
+%dir %{_localstatedir}/log/gdm
+%dir %{_localstatedir}/spool/gdm
 %attr(1770, gdm, gdm) %dir %{_localstatedir}/gdm
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.mandatory/%gconf-tree.xml
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.path
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.local/share/applications/mime-dummy-handler.desktop
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.local/share/applications/mimeapps.list
-%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
+%attr(1750, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.mandatory
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.mandatory/*.xml
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.path
 %attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter
+%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
 %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
+%{_localstatedir}/gdm/.local/share/applications/mime-dummy-handler.desktop
+%{_localstatedir}/gdm/.local/share/applications/mimeapps.list
+%{_sysconfdir}/dconf/profile/gdm
+%{_sysconfdir}/dconf/db/gdm
+
+%files plugin-smartcard
+%defattr(-, root, root)
+%config %{_sysconfdir}/pam.d/gdm-smartcard
+%dir %{_datadir}/gdm/simple-greeter/extensions/smartcard
+%{_datadir}/gdm/simple-greeter/extensions/smartcard/page.ui
+%{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
+%{_libexecdir}/gdm-smartcard-worker
+
+%files plugin-fingerprint
+%defattr(-, root, root)
+%config %{_sysconfdir}/pam.d/gdm-fingerprint
+%dir %{_datadir}/gdm/simple-greeter/extensions/fingerprint
+%{_datadir}/gdm/simple-greeter/extensions/fingerprint/page.ui
+%{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 
 %changelog
-* Mon Jul 11 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.2-6
-- add patch505 to fix login dialog focus problem
-  - (re-)revert upstream change.
-    http://git.gnome.org/browse/gdm/commit/?id=bc78b6c7fc40a6388ddb194461b7b5d140acd8d0
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+- merge spec and patch files
+
+	* Wed Aug  3 2011 Lennart Poettering <lpoetter@redhat.com> - 1:3.1.2-4
+	- Register welcome pseudo-session in PAM
+	* Tue Jun 28 2011 Ray Strode <rstrode@redhat.com> 3.1.2-3
+	- Disable fatal critcals
+	  Resolves: #717324
+	* Tue Jun 21 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.1.2-2
+	- Fix /dev/ull typo in scriptlets (#693046).
+	* Mon Jun 13 2011 Ray Strode <rstrode@redhat.com> 3.1.2-1
+	- Update for release
+	* Mon Jun 06 2011 Ray Strode <rstrode@redhat.com> 3.0.4-1
+	- Update to latest version
+	  Resolves CVE-2011-1709
+	* Fri Apr 15 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-2
+	- Put the Fedora logo back in the greeter
+	* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-1
+	- Update to 3.0.0
 
 * Sat Jul 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.2-5
 - add patch134 to disable a11y (revert upstream change)
@@ -1102,3 +1175,4 @@ fi
 
 * Sat Feb 06 1999 Michael Johnson <johnsonm@redhat.com>
 - initial packaging
+

+ 20 - 28
g/gedit-plugins/gedit-plugins-vl.spec

@@ -1,5 +1,5 @@
 Name:           gedit-plugins
-Version:        2.32.0
+Version:        3.1.2
 Release:        1%{?_dist_release}
 Summary:        A collection Official Plugins for gedit
 Summary:        gedit の公式プラグイン集
@@ -7,7 +7,7 @@ Summary:        gedit の公式プラグイン集
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins 
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.32/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.1/%{name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  intltool >= 0.35.0
@@ -15,17 +15,18 @@ BuildRequires:  perl >= 5.8.1
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gettext
 BuildRequires:  glib2-devel >= 2.24.0
-BuildRequires:  gtk2-devel >= 2.20.0
+BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  GConf2-devel
 BuildRequires:  gtksourceview2-devel >= 2.5.1
 BuildRequires:  gedit-devel >= 2.30.0
 BuildRequires:  gucharmap-devel >= 2.30.0
 BuildRequires:  gnome-doc-utils
-BuildRequires:  vte-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
 Requires:       gedit
 Requires:       pygtk2
 Requires:       pygtksourceview
@@ -34,6 +35,8 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 A collection of Official plugins for gedit.
@@ -82,48 +85,37 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-find $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins -name "*.la" -exec rm {} \;
+find $RPM_BUILD_ROOT/%{_libdir}/gedit/plugins -name "*.la" -exec rm {} \;
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gedit-show-tabbar-plugin.schemas >/dev/null || :
-fi
+%postun 
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
+%posttrans 
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gedit-show-tabbar-plugin.schemas > /dev/null || :
-
-
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gedit-show-tabbar-plugin.schemas > /dev/null || :
-fi
 
 %check
-[ -f ${RPM_BUILD_ROOT}%{_libdir}/gedit-2/plugins/terminal.py ]
+[ -f ${RPM_BUILD_ROOT}%{_libdir}/gedit/plugins/terminal.py ]
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS COPYING
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
-%{_libdir}/gedit-2/plugins/*
-%{_datadir}/gedit-2/plugins/*
+%{_libdir}/gedit/plugins/*
+%{_datadir}/gedit/plugins/*
+%{_datadir}/glib-2.0/schemas/*.xml
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.1.2-1
+- new upstream release
+- add BuildRequires: dbus-python-devel
+
 * Tue Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.32.0-1
 - new upstream release
 

+ 47 - 45
g/gedit/gedit-vl.spec

@@ -1,18 +1,20 @@
-%define glib2_version 2.26.0
-%define gtk2_version 2.22.0
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%define glib2_version 2.28.6
+%define gtk3_version 3.0.9
 %define desktop_file_utils_version 0.17
-%define gtksourceview_version 2.10.5
+%define gtksourceview3_version 3.0.1
 %define gnome_doc_utils_version 0.6.0
 %define pygobject_version 2.26.0
 
 Summary:	gedit is a small but powerful text editor for GNOME.
 Summary(ja):	GNOME 用の小さくかつ強力なテキストエディタ
 Name:		gedit
-Version:	2.30.4
+Version:	3.1.2
 Release:	1%{?_dist_release}
 License:	GPLv2
 Group:		Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.30/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.1/%{name}-%{version}.tar.xz
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -22,10 +24,10 @@ Requires:      python pygtk2 pygtksourceview
 Requires:      pygobject >= %{pygobject_version}
 
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: gtksourceview2-devel >= %{gtksourceview_version}
+BuildRequires: gtksourceview3-devel >= %{gtksourceview3_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: python-devel pygtk2-devel gtk-doc
 BuildRequires: pygobject-devel >= %{pygobject_version}
@@ -33,9 +35,13 @@ BuildRequires: pygtksourceview-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: libattr-devel
 BuildRequires: libffi-devel
-BuildRequires: intltool > 0.40
 BuildRequires: libSM-devel
+BuildRequires: libpeas-devel >= 0.7.3
+BuildRequires: gsettings-desktop-schemas
+BuildRequires: intltool > 0.40
 
+Vendor: Project Vine
+Distribution: Vine Linux
 Packager:	daisuke, inagaki
 
 %description
@@ -62,7 +68,7 @@ Summary: The files needed for developing plug-ins for the gedit editor.
 Summary(ja): gedit エディタ用のプラグイン開発
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gtksourceview2-devel >= %{gtksourceview_version}
+Requires: gtksourceview3-devel >= %{gtksourceview3_version}
 
 %description devel
 gedit is a small but powerful text editor for the GNOME GUI desktop.
@@ -101,14 +107,17 @@ desktop-file-install --delete-original       \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 ## clean up all the static libs for plugins (workaround for no -module)
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugin-loaders -name "*.la"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin-loaders -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.la"`
 /bin/rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
 ## clean up unpackage files
 #/bin/rm -rf $RPM_BUILD_ROOT%{_includedir}/gedit-2.20
 /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gedit
 
+/bin/rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gedit
+
 %find_lang %{name}
 
 %clean
@@ -117,56 +126,49 @@ rm -rf $RPM_BUILD_ROOT
 %post
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 scrollkeeper-update > /dev/null 2>&1 || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gedit.schemas gedit-file-browser.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule \
-    %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="gedit.schemas gedit-file-browser.schemas"
-  for S in $SCHEMAS; do
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/$S > /dev/null
-  done
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="gedit.schemas gedit-file-browser.schemas"
-  for S in $SCHEMAS; do
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/$S > /dev/null
-  done
-fi
 
 %postun
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 scrollkeeper-update > /dev/null 2>&1 || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/*
-%{_bindir}/*
-%{_libdir}/gedit-2
-%{_libexecdir}/gedit-2
-%{_datadir}/applications
-%{_datadir}/gedit-2
+%{_bindir}/gedit
+%{_bindir}/gnome-text-editor
+%{_libdir}/libgedit-private.so.*
+%{_libdir}/%{name}/girepository-1.0/*.typelib
+%{_libdir}/%{name}/plugins
+# %{_libexecdir}/%{name}/gedit-bugreport.sh
+%{python_sitearch}/gi
+%{_datadir}/GConf/gsettings/gedit.convert
+%{_datadir}/applications/gedit.desktop
+%{_datadir}/dbus-1/services/org.gnome.gedit.service
+%{_datadir}/%{name}/logo
+%{_datadir}/%{name}/plugins
+%{_datadir}/%{name}/ui
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/gnome
-%{_datadir}/omf
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/*
+%{_includedir}/%{name}-3.0
+%{_libdir}/libgedit-private.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/%{name}/gir-1.0/*.gir
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gtksourceview3-devel instead of gtksourceview2-devel
+- add BuildRequires: libpeas-devel, gsettings-desktop-schemas
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.4-1
 - new upstream release
 

+ 14 - 1
g/geoclue/geoclue-vl.spec

@@ -3,13 +3,15 @@ Summary(ja):    モジュール型地理情報サービス
 
 Name:           geoclue
 Version:        0.12.0
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Patch0:		geoclue-nm08.patch
+Patch1:		geoclue-use-libnm-glib.patch
+Patch2:		geoclue-unused-var.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -29,6 +31,9 @@ BuildRequires: libtool
 
 Requires: dbus
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Geoclue is a modular geoinformation service built on top of the D-Bus 
 messaging system. The goal of the Geoclue project is to make creating 
@@ -77,8 +82,11 @@ A gypsy provider for geoclue
 %prep
 %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
+libtoolize
 gtkdocize
 autoreconf
 
@@ -164,6 +172,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.0-3
+- rebuild with NetworkManager-0.8.9997
+- add Patch1 (geoclue-use-libnm-glib.patch) from fedora
+- add Patch2 (geoclue-unused-var.patch) from fedora
+
 * Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 0.12.0-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 9 - 3
g/gjs/gjs-vl.spec

@@ -1,11 +1,11 @@
-%define pkg_version 0.7.13
+%define pkg_version 1.29.15
 %define pkg_release 1%{?_dist_release}
 
 Summary:     Javascript binding for GNOME
 Name:        gjs
 Version:     %{pkg_version}
 Release:     %{pkg_release}
-Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.29/%{name}-%{version}.tar.xz
 License:     MPL1.1/LGPLv2+/GPLv2+
 Group:       User Interface/Desktops
 URL:         http://live.gnome.org/GnomeShell
@@ -21,9 +21,9 @@ BuildRequires: libSM-devel
 BuildRequires: libffi-devel
 BuildRequires: GConf2-devel
 BuildRequires: startup-notification-devel
+BuildRequires: js-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: desktop-file-utils
-BuildRequires: xulrunner-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -78,17 +78,23 @@ Development files of the gjs library.
 %{_bindir}/gjs*
 %{_libdir}/lib*.so.*
 %{_libdir}/gjs-1.0/*
+%{_libdir}/gjs/GjsDBus-1.0.typelib
 %{_datadir}/gjs-1.0/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gjs-1.0
 %{_libdir}/lib*.so
+%{_libdir}/gjs/GjsDBus-1.0.gir
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/doc/*
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.29.15-1
+- new upstream release
+- change BuildRequires: js-devel instead of xulrunner-devel
+
 * Sun Apr 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.13-1
 - new upstream release
 

+ 31 - 25
g/glade3/glade3-vl.spec

@@ -1,7 +1,7 @@
 %define	helpdir	glade3
 
-Version: 3.6.7
-Release: 4%{?_dist_release}
+Version: 3.10.0
+Release: 1%{?_dist_release}
 
 Summary: A user interface builder for the GTK+ toolkit and GNOME
 Summary(ja): GTK+ツールキット及びGNOME向けのユーザインターフェースビルダー
@@ -9,23 +9,22 @@ Name: glade3
 License: GPL
 Group: Applications/Development
 URL: http://glade.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.10/glade-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel >= 2.14.0
+BuildRequires: gtk3-devel >= 3.0.2
 BuildRequires: libxml2-devel >= 2.4.0 
-BuildRequires: libbonoboui-devel
-BuildRequires: libgnomeui-devel
+#BuildRequires: libbonoboui-devel
+#BuildRequires: libgnomeui-devel
 BuildRequires: libSM-devel
-#BuildRequires(install): desktop-file-utils
 BuildRequires: gnome-doc-utils
 
-Requires: gtk2 >= 2.14.0
+Requires: gtk3 >= 3.0.2
 Requires: libxml2 >= 2.4.0 
-Requires: libbonoboui
-Requires: libgnomeui
+#Requires: libbonoboui
+#Requires: libgnomeui
 Requires: devhelp
-Prereq: scrollkeeper
+Requires(pre): scrollkeeper
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -67,7 +66,7 @@ and integrate your custom (GTK+ based) widget toolkit into the Glade
 UI Builder.
 
 %prep
-%setup -q
+%setup -q -n glade-%{version}
 pushd src
 ## change gnome help directory
 mv glade-window.c glade-window.c.orig
@@ -92,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 #	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/modules/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgladeui-1.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.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}
@@ -107,7 +106,7 @@ for omf in $files; do
 done
 popd
       
-%find_lang %{name}
+%find_lang glade
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,26 +127,33 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
+%files -f glade.lang
 %defattr(-,root,root)
-%{_bindir}/glade-3
-%{_libdir}/libgladeui-1.so.*
-%{_libdir}/glade3/modules/*.so
-%{_datadir}/applications/*
-%{_datadir}/glade3
+%{_bindir}/glade
+%{_bindir}/glade-previewer
+%{_libdir}/libgladeui-2.so.*
+%{_libdir}/glade/modules/*.so
+%{_libdir}/girepository-1.0/Gladeui-2.0.typelib
+%{_datadir}/applications/glade.desktop
+%{_datadir}/glade
 %{_datadir}/gtk-doc/html/gladeui
 %{_datadir}/gnome/help/%{helpdir}
-%{_datadir}/icons/hicolor/*/apps/glade-3.png
-%{_datadir}/icons/hicolor/scalable/apps/glade-3.svg
+%{_datadir}/icons/hicolor/*/apps/glade.png
 %{_datadir}/omf/%{helpdir}
 
 %files	devel
 %defattr(-,root,root)
-%{_includedir}/libgladeui-1.0/gladeui/*
+%{_includedir}/libgladeui-2.0/gladeui/*
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/libgladeui-1.so
+%{_libdir}/libgladeui-2.so
+%{_datadir}/gir-1.0/Gladeui-2.0.gir
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.0-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- delete BuildRequires: libgnomeui-devel, libbonoboui-devel
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.7-4
 - rebuild with rpm-4.8.1 for pkg-config file
 - add BuildRequires: libSM-devel

+ 65 - 0
g/glib-networking/glib-networking-vl.spec

@@ -0,0 +1,65 @@
+Name:           glib-networking
+Version:        2.29.9
+Release:        1%{?_dist_release}
+Summary:        Networking support for GLib
+
+Group:          Development/Libraries
+License:        LGPLv2+
+URL:            http://www.gnome.org
+Source:         http://download.gnome.org/sources/glib-networking/2.29/%{name}-%{version}.tar.xz
+
+BuildRequires:  glib2-devel
+BuildRequires:  libproxy-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  intltool
+# need to build ca-bundle.crt 
+BuildRequires:  openssl
+Requires:       openssl
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+%description
+This package contains modules that extend the networking support in GIO.
+In particular, it contains a libproxy-based GProxyResolver implementation
+and a gnutls-based GTlsConnection implementation.
+
+%prep
+%setup -q
+
+
+%build
+%configure \
+	--with-libproxy \
+	--with-ca-certificates=%{_datadir}/ssl/certs/ca-bundle.crt
+
+make %{?_smp_mflags} V=1
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
+
+%find_lang %{name}
+
+%post
+gio-querymodules %{_libdir}/gio/modules
+
+%postun
+gio-querymodules %{_libdir}/gio/modules
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING NEWS README
+%{_libdir}/gio/modules/libgiolibproxy.so
+%{_libdir}/gio/modules/libgiognutls.so
+%{_libexecdir}/glib-pacrunner
+%{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
+
+
+%changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.29.9-1
+- initial build for Vine Linux
+

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

@@ -1,18 +1,22 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 Summary: A library of handy utility functions.
 Name: glib2
-Version: 2.28.6
+Version: 2.29.14
 Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.29/glib-%{version}.tar.xz
 Source2: glib2.sh
 Source3: glib2.csh
+
 BuildRoot: %{_tmppath}/glib-%{version}-root
+
 BuildRequires: pkgconfig >= 0.14
+BuildRequires: dbus-devel
 BuildRequires: gamin-devel
-BuildRequires: gtk-doc
+BuildRequires: libffi-devel
 BuildRequires: zlib-devel
+BuildRequires: gtk-doc
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
@@ -27,19 +31,20 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 
-This package provides version 2.28 of GLib.
+This package provides version 2.29 of GLib.
 
 %package devel
 Summary: Development files for the GLib library
 Group: Development/Libraries
-Obsoletes: glib-gtkbeta-devel
-Requires: pkgconfig >= 0.14
 Requires: %{name} = %{version}
+Requires: pkgconfig >= 0.14
+
+Obsoletes: glib-gtkbeta-devel
 Conflicts: glib-devel <= 1.2.8
 
 %description devel
 The glib-devel package includes the header files for 
-version 2.28 of the GLib library. 
+version 2.29 of the GLib library. 
 
 
 ## to build compat32 for x86_64 architecture support
@@ -54,18 +59,19 @@ handling for C, portability wrappers, and interfaces for such runtime
 functionality as an event loop, threads, dynamic loading, and an
 object system.
 
-This package provides version 2.28 of GLib.
+This package provides version 2.29 of GLib.
 
 %package -n compat32-%{name}-devel
 Summary: Development files for the GLib library
 Group: Development/Libraries
 Requires: pkgconfig >= 0.14
 Requires: compat32-%{name} = %{version}
+
 Conflicts: glib-devel <= 1.2.8
 
 %description -n compat32-%{name}-devel
 The glib-devel package includes the header files for 
-version 2.28 of the GLib library. 
+version 2.29 of the GLib library. 
 
 %prep
 %setup -q -n glib-%{version}
@@ -121,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
+%{_bindir}/gdbus-codegen
 %{_bindir}/glib-genmarshal
 %{_bindir}/glib-gettextize
 %{_bindir}/glib-mkenums
@@ -130,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
 %{_libdir}/glib-2.0
+%{_libdir}/gdbus-codegen
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*
@@ -158,6 +166,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.29.14-1
+- new upstream release
+- add BuildRequires: libffi-devel, dbus-devel
+
+* Sat Jun 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.8-1
+- new upstream release
+
 * Fri Apr 22 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.6-1
 - new upstream release
 

+ 8 - 3
g/glibmm/glibmm-vl.spec

@@ -3,12 +3,12 @@
 Summary:	A C++ interface for glib library.
 Summary(ja):	glib ライブラリの C++ インターフェイス
 Name:		glibmm
-Version:	2.25.5
+Version:	2.29.11
 Release:	1%{?_dist_release}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.gtkmm.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.25/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.29/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:       glib2 >= 2.26.0
 Requires:       libsigc++ >= 2.0.0
@@ -16,6 +16,9 @@ BuildRequires:	glib2-devel >= 2.26.0
 BuildRequires:  libsigc++-devel >= 2.0.0
 BuildRequires:  m4
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 glibmm is a set of C++ bindings for glib, including cross-platform APIs such
 as a std::string-like UTF8 string class, string utility methods, such as a
@@ -83,11 +86,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
 
-%{_datadir}/glibmm-%{ver}
 %{_datadir}/gtk-doc/html/*
 %{_datadir}/devhelp/books/glibmm-%{ver}
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.29.11-1
+- new upstream release
+
 * Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.25.5-1
 - new upstream release
 

+ 9 - 2
g/gmime/gmime-vl.spec

@@ -1,12 +1,12 @@
 Summary:        Library for creating and parsing MIME messages
 Summary(ja):	MIMEメッセージを生成またパースするためのライブラリ
 Name:           gmime
-Version:        2.4.24
+Version:        2.4.25
 Release:        1%{?_dist_release}
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://spruce.sourceforge.net/gmime/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  glib2-devel >= 2.26.0
@@ -25,6 +25,10 @@ BuildRequires:  gtk-sharp2 >= 2.8.0
 %define monodir %{_prefix}/lib/mono
 %endif
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 The GMime suite provides a core library and set of utilities which may be
 used for the creation and parsing of messages using the Multipurpose
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.25-1
+- new upstream release
+
 * Thu May 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.24-1
 - new upstream release
 

+ 22 - 11
g/gnome-applets/gnome-applets-vl.spec

@@ -1,12 +1,14 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define glib2_version 2.26.0
 %define pango_version 1.28.3
-%define gtk2_version 2.22.0
+%define gtk3_version 3.0.0
 %define libgnome_version 2.32.0
 %define gnome_panel_version 2.32.0
 %define libgtop2_version 2.28.2
 %define libgnome_desktop_version 2.32.0
 %define libxklavier_version 5.0
-%define libwnck_version 2.30.5
+%define libwnck3_version 3.0.0
 %define gnome_doc_utils_version 0.3.2
 %define hal_version 0.5.9
 %define gst_plugins_base_version 0.10.30
@@ -27,13 +29,13 @@
 Summary:        Small applications for the GNOME panel.
 Summary(ja):    GNOME パネル用の小さなアプリケーション(GNOMEパネルアプレット)
 Name:     	gnome-applets
-Version: 	2.32.1.1
+Version: 	3.1.4
 Release:        1%{?_dist_release}
 License:	GPL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 
-Source: 	http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
+Source: 	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/%{name}-%{version}.tar.xz
 Source10:	cpufreq-selector.app
 Source11:	cpufreq-selector.pam
 
@@ -47,14 +49,14 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires(post,postun): scrollkeeper >= 0.1.4
 
 BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  gtk3-devel >= %{gtk3_version}
 BuildRequires:  libgnome-devel >= %{libgnome_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libgtop2-devel >= %{libgtop2_version}
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gnome-desktop-devel >= %{libgnome_desktop_version}
 BuildRequires:  libxklavier-devel >= %{libxklavier_version}
-BuildRequires:  libwnck-devel >= %{libwnck_version}
+BuildRequires:  libwnck3-devel >= %{libwnck3_version}
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires:  libxml2-python
 BuildRequires:  gstreamer-plugins-base-devel >= %{gst_plugins_base_version}
@@ -77,11 +79,12 @@ BuildRequires:  polkit-gnome-devel
 BuildRequires:  gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires:  gucharmap-devel >= %{gucharmap_version}
 BuildRequires:  libSM-devel
+BuildRequires:  pygtk2-devel
 
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	gnome-desktop-libs >= %{libgnome_desktop_version}
 Requires:	libxklavier >= %{libxklavier_version}
-Requires:	libwnck >= %{libwnck_version}
+Requires:	libwnck3 >= %{libwnck3_version}
 ## Requires:	hal >= %{hal_version}
 Requires:	gstreamer-plugins-base >= %{gst_plugins_base_version}
 Requires:	polkit-gnome
@@ -89,6 +92,10 @@ Requires:       gnome-python-applet
 Requires:       gnome-python-libegg
 Obsoletes:      battstat_applet
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
@@ -201,22 +208,26 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %{_datadir}/pixmaps/*
-%{_datadir}/gnome-2.0/ui/*
+#%{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-applets
 %{_datadir}/icons/hicolor/*/apps/*
 %{_bindir}/*
-%{_libdir}/bonobo/servers/*
-#{python_sitelib}/invest/
+#%{_libdir}/bonobo/servers/*
+%{python_sitelib}/invest/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/sound
 %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
 %{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.*.service
-%{_datadir}/gnome-panel/applets/org.gnome.applets.*.panel-applet
+%{_datadir}/gnome-panel/4.0/applets/*.panel-applet
 %{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- add BuildRequires: pygtk2-devel
+
 * Sat Dec 18 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1.1-1
 - new upstream release
 

+ 9 - 3
g/gnome-backgrounds/gnome-backgrounds-vl.spec

@@ -1,18 +1,21 @@
 Summary:        Gnome Background images
 Summary(ja):    Gnome バックグラウンド画像
 Name:           gnome-backgrounds
-Version:        2.32.0
+Version:        3.1.2
 Release:        1%{?_dist_release}
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://www.gnome.org/
 
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 BuildRequires:  glib2-devel
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Background images from the GNOME project.
 
@@ -38,10 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %name.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%{_datadir}/backgrounds
 %{_datadir}/gnome-background-properties
-%{_datadir}/pixmaps/backgrounds
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+
 * Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 

+ 15 - 55
g/gnome-bluetooth/gnome-bluetooth-vl.spec

@@ -1,12 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Summary(ja): GNOME Bluetooth サブシステム
 Name: gnome-bluetooth
-Version: 2.32.0
+Version: 3.1.4
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/3.1/%{name}-%{version}.tar.bz2
 Source1: 61-gnome-bluetooth-rfkill.rules
 #----------------------------------------------------------------------------
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -19,9 +19,10 @@ BuildRequires: libbonobo-devel >= 2.32.0
 BuildRequires: libbonoboui-devel >= 2.24.4
 BuildRequires: GConf2-devel >= 2.32
 BuildRequires: hal-devel
-BuildRequires: unique-devel
+BuildRequires: unique3-devel
 BuildRequires: libnotify-devel
 BuildRequires: gnome-doc-utils
+BuildRequires: control-center-devel
 
 BuildRequires: intltool, automake, libtool, gettext
 Requires: %{name}-libs = %{version}-%{release}
@@ -36,6 +37,10 @@ ExcludeArch: s390 s390x
 
 ## Patch1: gnome-bluetooth-0.8.0-desktop.patch
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 #----------------------------------------------------------------------------
 %description
 This package contains a library with widgets for Bluetooth applications.
@@ -99,7 +104,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libbluetooth.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-bluetooth/plugins/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus-sendto/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/control-center-1/panels/*.la
 
 install -m0644 -D %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
 
@@ -129,57 +134,11 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-#if [ "$1" -gt 1 ]; then
-#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-#      gconftool-2 --makefile-uninstall-rule \
-#        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
-#    fi
-#fi
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
-	fi
-	if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule 				\
-		%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
-		>& /dev/null || :
-	fi
-fi
-
 %post
 update-desktop-database -q
 
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
-
-%preun
-#if [ "$1" -eq 0 ]; then
-#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-#      gconftool-2 --makefile-uninstall-rule \
-#        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-#    fi
-#fi
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-	fi
-	if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule 				\
-		%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
-		>& /dev/null || :
-	fi
-fi
-
 %postun
 update-desktop-database -q
-glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 if [ $1 -eq 0 ] ; then
 	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -206,11 +165,10 @@ fi
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_bindir}/bluetooth-*
 %{_libdir}/gnome-bluetooth/
+%{_libdir}/control-center-1/panels/libbluetooth.so
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
 %{_datadir}/locale/*
-%{_datadir}/GConf/gsettings/gnome-bluetooth
-%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.gschema.xml
 %{_mandir}/man1/*
 /lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
 
@@ -230,11 +188,13 @@ fi
 %{_datadir}/gir-1.0/GnomeBluetooth-1.0.gir
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
-#----------------------------------------------------------------------------
-# Maintainers: babasaki@mindgear.org
-#
 #----------------------------------------------------------------------------
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: unique3-devel instead of unique-devel
+- add BuildRequires: control-center-devel
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 - remove BuildRequires: gir-repository-devel

+ 49 - 42
g/gnome-color-manager/gnome-color-manager-vl.spec

@@ -2,12 +2,12 @@
 
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   2.32.0
+Version:   3.1.2
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
-Source0:   http://download.gnome.org/sources/gnome-color-manager/2.32/%{name}-%{version}.tar.bz2
+Source0:   http://download.gnome.org/sources/gnome-color-manager/3.1/%{name}-%{version}.tar.xz
 
 Requires:  gnome-icon-theme
 Requires:  shared-mime-info
@@ -16,33 +16,46 @@ Requires(pre):    GConf2
 Requires(post):   GConf2
 Requires(preun):  GConf2
 
-BuildRequires: gtk2-devel >= 2.16.0
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libtool
-BuildRequires: vte-devel
+BuildRequires: vte3-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: unique-devel >= 1.0.0
+BuildRequires: unique3-devel >= 3.0.0
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
 BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
-BuildRequires: gnome-desktop-devel
+BuildRequires: gnome-desktop3-devel
 BuildRequires: lcms-devel
 BuildRequires: cups-devel
 BuildRequires: sane-devel
 BuildRequires: libtiff-devel
-BuildRequires: libcanberra-devel
+BuildRequires: libcanberra-gtk3-devel
 BuildRequires: libnotify-devel
-BuildRequires: GConf2
+BuildRequires: lcms2-devel
+BuildRequires: gnome-settings-daemon-devel
+BuildRequires: libusb1-devel
+BuildRequires: control-center-devel
+BuildRequires: exiv2-devel
+BuildRequires: colord-devel
+
+Obsoletes: %{name}-libs < 3.1.0
+Obsoletes: %{name}-devel < 3.1.0
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
 and generate color profiles in the GNOME desktop.
 
+
 %prep
 %setup -q
 
@@ -53,35 +66,23 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for i in gcm-prefs gcm-import ; do
+for i in gcm-import ; do
   desktop-file-install --delete-original                                \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications/                      \
     $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
 done
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.{la,a}
+
 %find_lang %name --with-gnome
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas > /dev/null
-
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /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/gnome-color-manager.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/gnome-color-manager.schemas > /dev/null
-fi
-
-
 %postun
 if [ $1 -eq 0 ]; then
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -89,36 +90,42 @@ if [ $1 -eq 0 ]; then
 fi
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-/lib/udev/rules.d/*.rules
+%{_sysconfdir}/xdg/autostart/*.desktop
 %{_bindir}/gcm-*
-%dir %{_datadir}/gnome-color-manager
-%{_datadir}/gnome-color-manager/gcm-*.ui
-%dir %{_datadir}/gnome-color-manager/targets
-%dir %{_datadir}/gnome-color-manager/icons
-%{_datadir}/gnome-color-manager/targets/*.png
-%{_datadir}/gnome-color-manager/icons/*.svg
-%{_datadir}/man/man1/*.1.gz
+%{_libexecdir}/gcm-helper-exiv
+%{_datadir}/applications/gcm-*.desktop
+%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
+%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/gcm-*.ui
+%{_datadir}/%{name}/figures/*.png
+%{_datadir}/%{name}/icons/*.svg
+%{_datadir}/%{name}/targets/*.png
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/applications/gcm-prefs.desktop
-%{_datadir}/applications/gcm-import.desktop
-%{_sysconfdir}/xdg/autostart/*.desktop
-%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
-%{_sbindir}/gcm-install-system-wide
-%{_datadir}/polkit-1/actions/org.gnome.color.policy
+%{_datadir}/man/man1/*.1.gz
 
-# this is probably better in a shared package
-%dir %{_localstatedir}/lib/color
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- change BuildRequires: vte3-devel instead of vte-devel
+- add BuildRequires: lcms2-devel, gnome-settings-daemon-devel, libusb1-devel, control-center-devel, exiv2-devel, colord-devel
+- remove -libs and -devel sub package
+
 * Mon Oct 04 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 

+ 36 - 29
g/gnome-desktop-sharp2/gnome-desktop-sharp2-vl.spec

@@ -2,7 +2,7 @@
 %define _name gnome-desktop-sharp
 Name: gnome-desktop-sharp2
 Version: 2.26.0
-Release: 9%{?_dist_release}
+Release: 10%{?_dist_release}
 Summary: Mono bindings for libgnome-desktop
 Summary(ja): Mono 用 libgnome-desktop バインディング
 Group: Development/Libraries
@@ -14,14 +14,17 @@ Patch0: gnome-desktop-sharp-lib-target.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mono-devel monodoc
 BuildRequires: gnome-sharp2 gtk-sharp2-gapi
-BuildRequires: librsvg2-devel libwnck-devel vte-devel
+BuildRequires: librsvg2-devel libwnck-devel
 BuildRequires: gtkhtml3-devel gtksourceview2-devel
 #BuildRequires: nautilus-cd-burner
 BuildRequires: gnome-desktop-devel libgnomeprintui-devel
-BuildRequires: gnome-panel-devel
+#BuildRequires: gnome-panel-devel
 
 Packager:      konno, daisuke, ryoichi
 
+Obsoletes:	gnome-panel-sharp < 2.26.0-10
+Obsoletes:	vte016-sharp < 2.26.0-10
+
 %description
 This package contains Mono bindings for libgnome-desktop.
 
@@ -53,12 +56,12 @@ Group: Development/Libraries
 %description -n wnck-sharp
 This package contains Mono bindings wnck.
 
-%package -n vte016-sharp
-Summary: Mono bindings for vte
-Group: Development/Libraries
+#%package -n vte016-sharp
+#Summary: Mono bindings for vte
+#Group: Development/Libraries
 
-%description -n vte016-sharp
-This package contains Mono bindings for vte.
+#%description -n vte016-sharp
+#This package contains Mono bindings for vte.
 
 #%package -n nautilusburn-sharp
 #Summary: Mono bindings for nautilusburn
@@ -67,12 +70,12 @@ This package contains Mono bindings for vte.
 #%description -n nautilusburn-sharp
 #This package contains Mono bindings for libnautilus-burn.
 
-%package -n gnome-panel-sharp
-Summary: Mono bindings for gnome-panel
-Group: Development/Libraries
+#%package -n gnome-panel-sharp
+#Summary: Mono bindings for gnome-panel
+#Group: Development/Libraries
 
-%description -n gnome-panel-sharp
-This package contains Mono bindings for gnome-panel.
+#%description -n gnome-panel-sharp
+#This package contains Mono bindings for gnome-panel.
 
 %package -n gnome-print-sharp
 Summary: Mono bindings for gnome-print
@@ -147,14 +150,14 @@ rm -rf $RPM_BUILD_ROOT
 #%{_libdir}/pkgconfig/nautilusburn-sharp.pc
 #%{_libdir}/libnautilusburnsharpglue-2.so
 
-%files -n vte016-sharp
-%defattr(-, root, root)
-%{mono_dir}/vte-sharp-0.16
-%{mono_dir}/gac/*vte-sharp
-%dir %{_datadir}/vte-sharp
-%{_datadir}/vte-sharp/0.16
-%{_libdir}/libvtesharpglue-2.so
-%{_libdir}/pkgconfig/vte-sharp-0.16.pc
+#%files -n vte016-sharp
+#%defattr(-, root, root)
+#%{mono_dir}/vte-sharp-0.16
+#%{mono_dir}/gac/*vte-sharp
+#%dir %{_datadir}/vte-sharp
+#%{_datadir}/vte-sharp/0.16
+#%{_libdir}/libvtesharpglue-2.so
+#%{_libdir}/pkgconfig/vte-sharp-0.16.pc
 
 %files -n wnck-sharp
 %defattr(-, root, root)
@@ -165,14 +168,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/wnck-sharp-1.0.pc
 %{_libdir}/libwncksharpglue-2.so
 
-%files -n gnome-panel-sharp
-%defattr(-, root, root)
-%{mono_dir}/gnome-panel-sharp-2.24
-%{mono_dir}/gac/gnome-panel-sharp
-%dir %{_datadir}/gnome-panel-sharp
-%{_datadir}/gnome-panel-sharp/2.24
-%{_libdir}/pkgconfig/gnome-panel-sharp-2.24.pc
-%{_libdir}/libgnomepanelsharpglue-2.so
+# %files -n gnome-panel-sharp
+# %defattr(-, root, root)
+# %{mono_dir}/gnome-panel-sharp-2.24
+# %{mono_dir}/gac/gnome-panel-sharp
+# %dir %{_datadir}/gnome-panel-sharp
+# %{_datadir}/gnome-panel-sharp/2.24
+# %{_libdir}/pkgconfig/gnome-panel-sharp-2.24.pc
+# %{_libdir}/libgnomepanelsharpglue-2.so
 
 %files -n gnome-print-sharp
 %defattr(-, root, root)
@@ -183,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gnome-print-sharp-2.18.pc
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.0-10
+- drop BuildRequires: gnome-panel-devel
+- drop gnome-panel-sharp and vte016-sharp sub package
+
 * Tue Dec 14 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26.0-9
 - change BuildRequires: gnome-panel-devel instead of gnome-panel
 

+ 11 - 8
g/gnome-desktop/gnome-desktop-vl.spec

@@ -1,7 +1,7 @@
-%define glib2_version 2.26.1
-%define pango_version 1.28.3
-%define gtk2_version 2.22.1
-%define gconf2_version 2.32.0
+%define glib2_version 2.28.6
+%define pango_version 1.28.4
+%define gtk2_version 2.24.5
+%define gconf2_version 2.32.2
 %define startup_notification_version 0.10
 
 %define po_package gnome-desktop-2.0
@@ -10,7 +10,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautil
 Summary(ja): gnome-panel, gnome-session, nautilus などの共用プログラム
 Name: gnome-desktop
 Version: 2.32.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 URL: http://www.gnome.org/
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.32/%{name}-%{version}.tar.bz2
 Source10: gnome-modem.png
@@ -94,7 +94,7 @@ install -m664 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 # for compatibility
 ln -sf gnome-emacs.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/emacs.png
 
-%find_lang %{po_package}
+%find_lang %{po_package} --all-name --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -116,11 +116,11 @@ scrollkeeper-update
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_datadir}/applications/*
 %{_datadir}/gnome-about
-%{_datadir}/gnome
-%{_datadir}/omf/*
 %{_datadir}/pixmaps/*
 %{_datadir}/man/man*/*
 %{_bindir}/*
+%exclude %{_datadir}/gnome
+%exclude %{_datadir}/omf
 
 %files libs
 %defattr(-,root,root)
@@ -135,6 +135,9 @@ scrollkeeper-update
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-2
+- fix conflict with gnome-desktop3
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 

+ 117 - 0
g/gnome-desktop3/gnome-desktop3-vl.spec

@@ -0,0 +1,117 @@
+%define glib2_version 2.28.6
+%define pango_version 1.28.4
+%define gtk3_version 3.0.9
+%define gconf2_version 2.32.2
+%define startup_notification_version 0.10
+
+%define po_package gnome-desktop-3.0
+
+Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
+Summary(ja): gnome-panel, gnome-session, nautilus などの共用プログラム
+Name: gnome-desktop3
+Version: 3.1.4
+Release: 1%{?_dist_release}
+URL: http://www.gnome.org/
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.1/gnome-desktop-%{version}.tar.xz
+License: GPL 
+Group: User Interface/Desktops
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+# Requires for Vine
+Requires: ibus-gtk3
+Requires: gnome-icon-theme-symbolic
+Requires: gnome-themes-standard
+Requires: gsettings-desktop-schemas
+
+Requires(post,postun): scrollkeeper
+Obsoletes: gnome-core gnome-core-devel
+Provides: gnome-core
+
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: GConf2-devel >= %{gconf2_version}
+BuildRequires: startup-notification-devel >= %{startup_notification_version}
+BuildRequires: libXrandr-devel
+BuildRequires: autoconf, automake
+BuildRequires: gnome-doc-utils
+BuildRequires: docbook-utils
+BuildRequires: gsettings-desktop-schemas
+
+%description
+
+The gnome-desktop package contains an internal library
+(libgnomedesktop3) used to implement some portions of the GNOME
+desktop, and also some data files and other shared components of the
+GNOME user environment.
+
+%package devel
+Summary: Libraries and headers for libgnome-desktop
+Summary(ja): libgnome-desktop の開発用ライブラリおよびヘッダファイル
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+Requires: glib2-devel >= %{glib2_version}
+Requires: gtk3-devel >= %{gtk3_version}
+Requires: GConf2-devel >= %{gconf2_version}
+Requires: startup-notification-devel >= %{startup_notification_version}
+
+%description devel
+
+Libraries and header files for the GNOME-internal private library 
+libgnomedesktop
+
+%prep
+%setup -q -n gnome-desktop-%{version}
+
+%build
+%configure --with-gnome-distributor="Project Vine" --disable-scrollkeeper
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%makeinstall
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%find_lang %{po_package}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post 
+/sbin/ldconfig
+scrollkeeper-update
+
+%postun 
+/sbin/ldconfig
+scrollkeeper-update
+
+
+%files -f %{po_package}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/lib*.so.*
+%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
+%{_datadir}/libgnome-desktop-3.0
+%{_datadir}/gnome/*
+%{_datadir}/omf/*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
+%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
+%{_datadir}/gtk-doc
+
+%changelog
+* Thu Aug 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- initial build for Vine Linux

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

@@ -1,18 +1,22 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.32.0
+Version: 3.0.3
 Release: 1%{?dist}
 License: GFDL
 Group: System Environment/Libraries
 URL: http://library.gnome.org
 #VCS: git:git://git.gnome.org/gnome-devel-docs
-Source: http://download.gnome.org/sources/gnome-devel-docs/2.32/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-devel-docs/3.0/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
 BuildRequires: rarian-compat
 BuildRequires: docbook-utils
 BuildRequires: gettext
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 This package contains documents which are targeted for GNOME developers.
 It contains, e.g., the Human Interface Guidelines, the Integration Guide
@@ -41,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README AUTHORS NEWS COPYING
 
 %changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.0.3-1
+- new upstream release
+
 * Sat Oct 09 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.32.0-1
 - initial build for Vine Linux
 

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

@@ -9,29 +9,29 @@
 %define libnotify_version         0.4.5
 %define nautilus_version          2.32
 %define libatasmart_version       0.14
-%define avahi_version             0.6.25
+%define avahi_version             0.6.30
 
 Summary: Disk management application
 Summary(ja): ディスク管理アプリケーション
 Name: gnome-disk-utility
-Version: 2.32.0
+Version: 3.0.2
 Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: libgnome-keyring-devel >= %{libgnome_keyring_version}
 BuildRequires: udisks-devel >= %{udisks_version}
-BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: unique3-devel >= %{unique3_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
@@ -43,6 +43,10 @@ Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 This package contains the Palimpsest disk management application.
 Palimpsest supports partitioning, file system creation, encryption,
@@ -114,6 +118,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # TODO: upstream doesn't ship a HACKING file yet
 echo " " > HACKING
 
+perl -pi -e 's/OnlyShowIn=GNOME;Unity;/OnlyShowIn=GNOME;/' $RPM_BUILD_ROOT%{_datadir}/applications/palimpsest.desktop
+perl -pi -e 's/OnlyShowIn=GNOME;Unity;/OnlyShowIn=GNOME;/' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
+
 desktop-file-install --delete-original  \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/palimpsest.desktop
@@ -124,8 +131,8 @@ desktop-file-install --delete-original  \
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.a
 
 
 %find_lang %{name}
@@ -164,7 +171,7 @@ fi
 
 %{_libexecdir}/gdu-notification-daemon
 %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
-%{_libdir}/nautilus/extensions-2.0/*.so
+%{_libdir}/nautilus/extensions-3.0/*.so
 %{_libexecdir}/gdu-format-tool
 
 %{_bindir}/palimpsest
@@ -213,6 +220,11 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+
 * Tue Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 - fix %files

+ 8 - 1
g/gnome-doc-utils/gnome-doc-utils-vl.spec

@@ -2,7 +2,7 @@ Summary: Documentation utilities for the GNOME project
 Summary(ja): GNOMEプロジェクト用ドキュメントユーティリティ
 Name: gnome-doc-utils
 Version: 0.20.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPL
 Group: Development/Tools
 URL: http://www.gnome.org/
@@ -17,8 +17,12 @@ BuildRequires: pkgconfig
 Requires: libxml2 >= 2.6.12
 Requires: libxslt >= 1.1.8
 Requires: libxml2-python
+Requires: docbook-dtds
 Requires(post,postun): scrollkeeper
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 gnome-doc-utils is a collection of documentation utilities for the GNOME
 project. Notably, it contains utilities for building documentation and
@@ -69,6 +73,9 @@ scrollkeeper-update > /dev/null 2>&1 || :
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.20.6-2
+- add Requires: docbook-dtds
+
 * Thu May 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.20.6-1
 - new upstream release
 

+ 5 - 2
g/gnome-games-extra-data/gnome-games-extra-data-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 2.30.0
+%define pkg_version 3.0.0
 %define pkg_release 1%{?_dist_release}
 
 Summary:	Extra data files for the gnome-games
@@ -11,7 +11,7 @@ License:	GPL
 Group:		Applications/Games
 URL:		http://live.gnome.org/GnomeGamesExtraData/ 
 
-Requires: gnome-games >= 2.30
+Requires: gnome-games >= 3.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
@@ -50,6 +50,9 @@ This package contains extra data files for the gnome-games package. At the momen
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Wed Apr 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
 - initial build for Vine Linux
 

+ 32 - 53
g/gnome-games/gnome-games-vl.spec

@@ -4,7 +4,7 @@
 
 %define glib2_version 2.26.1
 %define pango_version 1.28.3
-%define gtk2_version 2.22.1
+%define gtk3_version 3.0.0
 %define libgnomeui_version 2.24.4
 %define desktop_file_utils_version 0.2.90
 %define gnome_python_desktop 2.30.0
@@ -13,12 +13,12 @@
 Summary: GNOME games
 Summary(ja): GNOME ゲーム集
 Name: gnome-games
-%define major 2.32
-Version: %{major}.1
-Release: 3%{_dist_release}
+%define major 3.1
+Version: %{major}.4
+Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL+
 Group: Applications/Games
-Source:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/%{major}/%{name}-%{version}.tar.bz2
+Source:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/%{major}/%{name}-%{version}.tar.xz
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 ## patch from FC-package
 Patch2: gnome-games-libs.patch
@@ -29,7 +29,6 @@ URL: http://www.gnome.org
 
 Requires(post,postun): scrollkeeper >= 0.1.4
 Requires(pre,post,preun): GConf2
-Requires(post,preun): ggz-client-libs
 
 Requires: GConf2
 Requires: pygtk2
@@ -41,7 +40,7 @@ Requires: gnome-python-rsvg
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: pygtk2-devel
 BuildRequires: pygtkglext-devel
 BuildRequires: gnome-python-desktop >= %{gnome_python_desktop}
@@ -55,9 +54,11 @@ BuildRequires: gstreamer-devel >= %{gstreamer_version}
 BuildRequires: clutter-devel, clutter-gtk-devel
 BuildRequires: libSM-devel
 BuildRequires: check-devel
-BuildRequires: libcanberra-devel
+BuildRequires: libcanberra-gtk3-devel
 BuildRequires: gobject-introspection-devel
-BuildRequires: docbook-dtds
+BuildRequires: sqlite3-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: docbook-style-xsl
 
 # Newer than internal gettext needed
 BuildRequires: gettext
@@ -66,8 +67,6 @@ BuildRequires: perl(XML::Parser)
 BuildRequires: autoconf >= 2.60
 BuildRequires: gnome-doc-utils >= 0.3.2
 
-BuildRequires: libggz-devel
-BuildRequires: ggz-client-libs-devel
 
 Provides: gnome-sudoku
 Obsoletes: gnome-sudoku
@@ -77,6 +76,9 @@ Obsoletes: glchess < 2.0
 
 BuildRequires: gcc-c++
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 
 The gnome-games package includes some small games that come with the
@@ -104,10 +106,10 @@ autoconf
 export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL"
 # swell-foop, lightsoff: remove (vine6)
 %configure \
-	--with-gtk=2.0 \
+	--with-gtk=3.0 \
 	--with-sound=gstreamer \
 	--localstatedir=/var/lib \
-	--enable-games="aisleriot,quadrapassel,gnect,gnomine,mahjongg,gtali,gnotravex,gnotski,glines,iagno,glchess,gnobots2,gnibbles,gnome-sudoku" \
+	--enable-games="quadrapassel,gnect,gnomine,mahjongg,gtali,gnotravex,gnotski,glines,iagno,glchess,gnobots2,gnibbles,gnome-sudoku" \
 	--disable-gnuchess
 make 
 
@@ -146,25 +148,9 @@ desktop-file-install --vendor gnome --delete-original       \
   --remove-category PuzzleGame				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-glines.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop
-
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' \
      $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
 
-# we need this in %%post
-## cp gnect/data/gnect-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-## cp gnibbles/gnibbles-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-## cp iagno/iagno-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-
-# but we don't want this
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
-
 %find_lang %{gettext_package} --all-name --with-gnome
 
 %clean
@@ -176,15 +162,12 @@ scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;	\
 gconftool-2 --makefile-install-rule	\
-	aisleriot.schemas		\
-	glchess.schemas			\
 	glines.schemas			\
 	gnect.schemas			\
 	gnibbles.schemas		\
 	gnobots2.schemas		\
 	gnome-sudoku.schemas		\
 	gnomine.schemas			\
-	gnotravex.schemas		\
 	gnotski.schemas			\
 	gtali.schemas			\
 	iagno.schemas			\
@@ -197,24 +180,17 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-ggz-config -i -f -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-ggz-config -i -f -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-ggz-config -i -f -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
-
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
-	aisleriot.schemas		\
-	glchess.schemas			\
 	glines.schemas			\
 	gnect.schemas			\
 	gnibbles.schemas		\
 	gnobots2.schemas		\
 	gnome-sudoku.schemas		\
 	gnomine.schemas			\
-	gnotravex.schemas		\
 	gnotski.schemas			\
 	gtali.schemas			\
 	iagno.schemas			\
@@ -228,25 +204,18 @@ if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
-	aisleriot.schemas		\
-	glchess.schemas			\
 	glines.schemas			\
 	gnect.schemas			\
 	gnibbles.schemas		\
 	gnobots2.schemas		\
 	gnome-sudoku.schemas		\
 	gnomine.schemas			\
-	gnotravex.schemas		\
 	gnotski.schemas			\
 	gtali.schemas			\
 	iagno.schemas			\
 	mahjongg.schemas		\
 	quadrapassel.schemas		\
 > /dev/null || : )
-
-  ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-  ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-  ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
 fi
 
 %postun
@@ -255,6 +224,11 @@ touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans 
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 
 %files -f %{gettext_package}.lang
@@ -263,30 +237,29 @@ fi
 
 %{_datadir}/applications/*
 %{_datadir}/gnome-games
-%{_datadir}/gnome-games-common
+#%{_datadir}/gnome-games-common
 %{_datadir}/glchess
 %{_datadir}/gnome-sudoku
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man6/*
 %{_sysconfdir}/gconf/schemas/*
+%{_datadir}/glib-2.0/schemas/*.xml
 %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
+#%{_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
 
 # these are not setgid games
 %{_bindir}/gnect
-%{_bindir}/sol
+#%{_bindir}/sol
 ## %{_bindir}blackjack
 %{_bindir}/glchess
 %{_bindir}/gnome-sudoku
 
-## %{_datadir}/ggz
-
 # these are setgid games
 %attr(2551, root, games) %{_bindir}/gnomine
 %attr(2551, root, games) %{_bindir}/mahjongg
@@ -303,6 +276,12 @@ fi
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- add BuildRequires: sqlite3-devel, mesa-libGLU-devel
+
 * Sun Apr 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-3
 - add Requires: gnome-python-rsvg
 

+ 88 - 0
g/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-vl.spec

@@ -0,0 +1,88 @@
+Summary: Symbolic GNOME icons
+Name: gnome-icon-theme-symbolic
+Version: 3.1.4
+Release: 1%{?_dist_release}
+Source0: http://download.gnome.org/sources/gnome-icon-theme-symbolic/3.1/%{name}-%{version}.tar.xz
+License: CC-BY-SA
+BuildArch: noarch
+Group: User Interface/Desktops
+BuildRequires: icon-naming-utils >= 0.8.7
+Requires: gnome-icon-theme >= 2.30.2.1-2
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+This package contains symbolic icons for use by the GNOME desktop.
+
+%prep
+%setup -q
+
+%build
+export ac_cv_path_GTK_UPDATE_ICON_CACHE=/bin/true
+
+%configure
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/gnome &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+
+%files
+%defattr(-,root,root)
+%doc COPYING AUTHORS
+%{_datadir}/icons/gnome/*
+
+%changelog
+* Sat Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- initial build for Vine Linux
+
+
+* Mon Jul 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Sat May 07 2011 Christopher Aillon <caillon@redhat.com> - 3.0.0-2
+- Update icon cache scriptlet
+
+* Tue Apr  5 2011 Christopher Aillon <caillon@redhat.com> 3.0.0-1
+- Update to 3.0.0
+
+* Tue Mar 29 2011 Matthias Clasen <mclasen@redhat.com> 2.91.93-1
+- Update to 2.91.93
+
+* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> 2.91.92-1
+- Update to 2.91.92
+
+* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.7-1
+- Update to 2.91.7
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.91.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Feb  3 2011 Christopher Aillon <caillon@redhat.com> - 2.91.6-1
+- Update to 2.91.6
+
+* Wed Aug 18 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.0-1
+- Update to 2.31.0
+
+* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-3
+- Require gnome-icon-theme-2.30.2.1-2 so that we have scalable
+  directories
+
+* Fri Apr 30 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-2
+- Updated for review comments
+
+* Thu Apr 29 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-1
+- First build
+

+ 10 - 3
g/gnome-icon-theme/gnome-icon-theme-vl.spec

@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Summary(ja): 基本 GNOME アイコン
 Name: gnome-icon-theme
-Version: 2.31.0
-Release: 2%{?_dist_release}
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.31/%{name}-%{version}.tar.bz2
+Version: 3.0.0
+Release: 1%{?_dist_release}
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.0/%{name}-%{version}.tar.bz2
 #Source10: %{name}-ja.po
 License: GPL
 BuildArch: noarch
@@ -14,6 +14,10 @@ BuildRequires: icon-naming-utils >= 0.8.7
 BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 Contains the base icons needed by the Gnome desktop environment.
 
@@ -53,6 +57,9 @@ fi
 %{_datadir}/pkgconfig/*.pc
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Sat May 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.31.0-2
 - rebuild with icon-naming-utils-0.8.90
 

+ 43 - 28
g/gnome-keyring/gnome-keyring-vl.spec

@@ -1,38 +1,37 @@
-%define gtk2_version 2.22.0
+%define gtk3_version 3.1.10
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Summary: A framework for managing user passwords and other secrets
 Summary(ja): ユーザのパスワードや秘匿情報を管理するためのフレームワーク
 Name: gnome-keyring
-Version: 2.32.1
+Version: 3.1.4
 Release: 1%{?_dist_release}
 License: GPL/LGPL
 Group: System Environment/Libraries
-Source: gnome-keyring-%{version}.tar.bz2
+Source: gnome-keyring-%{version}.tar.xz
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: gtk2 >= %{gtk2_version}
+Requires: gtk3 >= %{gtk3_version}
 Requires(post,pre,preun): GConf2
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= 1.0
 BuildRequires: dbus-devel >= 1.0
 BuildRequires: gettext
+BuildRequires: libcap-ng-devel
 BuildRequires: libgcrypt-devel
 BuildRequires: libtasn1-devel
+BuildRequires: openssl-devel
+BuildRequires: p11-kit-devel
 BuildRequires: pam-devel
 BuildRequires: autoconf, automake, libtool
 BuildRequires: intltool
 BuildRequires: perl(XML::Parser)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=484612 
-Patch0:    gnome-keyring-2.20-selinux-pam.patch
-
-# autounlock does not currently work, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=250147
-Patch1: no-autounlock.patch
-
-# patch for vine linux
 Patch2: %{name}-2.31.91-configure-vine.patch
+Patch3:	gnome-keyring-3.1.4-git20110729.patch
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 gnome-keyring manages passwords and other types of secrets
@@ -105,13 +104,16 @@ and start the keyring daemon.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-
-#patch0 -p1 -b .selinux_pam
-#patch1 -p1 -b .no-autounlock
 %patch2 -p1 -b .vine
+%patch3 -p1 -b .git
 
 %build
-%configure --disable-gtk-doc --enable-pam --with-pam-dir=/%{_lib}/security
+%configure \
+	--with-gtk=3.0 \
+	--disable-gtk-doc \
+	--enable-pam \
+	--with-pam-dir=/%{_lib}/security \
+	--with-root-certs=%{_datadir}/ssl/certs 
 make %{?_smp_mflags}
 
 %install
@@ -125,17 +127,24 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pam_gnome_keyring.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ]; then
-       glib-compile-schemas %{_datadir}/glib-2.0/schemas
+	glib-compile-schemas %{_datadir}/glib-2.0/schemas
+	gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
 %posttrans
@@ -148,6 +157,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING COPYING.LIB
+%{_sysconfdir}/pkcs11/modules/gnome-keyring-module
 %{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
@@ -155,16 +165,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/gnome-keyring
-%{_libdir}/gnome-keyring/*.so
 %{_libdir}/gnome-keyring/devel/*.so
-%{_libdir}/gnome-keyring/standalone/*.so
+%{_libdir}/pkcs11/gnome-keyring-pkcs11.so
 %{_libexecdir}/*
+%{_datadir}/applications/gnome-keyring-prompt.desktop
 %{_datadir}/dbus-1/services/*
-%{_datadir}/gnome-keyring
-%dir %{_datadir}/gcr
-%{_datadir}/gcr/ui/*.ui
+%{_datadir}/gnome-keyring-3
+%dir %{_datadir}/gcr-3
+%{_datadir}/gcr-3/ui/*.ui
 %{_datadir}/GConf/gsettings/*
 %{_datadir}/glib-2.0/schemas/*
+%{_datadir}/icons/hicolor/*/apps/*.png
 
 %files devel
 %defattr(-, root, root)
@@ -172,8 +183,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 ## %{_datadir}/gtk-doc/html/gnome-keyring
-%{_datadir}/gtk-doc/html/gp11
-%{_datadir}/gtk-doc/html/gcr-0
+%{_datadir}/gtk-doc/html/gcr-3
+%{_datadir}/gtk-doc/html/gck
 
 %files pam
 %defattr(-, root, root)
@@ -185,9 +196,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %defattr(-, root, root)
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/gnome-keyring
-%{_libdir}/gnome-keyring/*.so
 %{_libdir}/gnome-keyring/devel/*.so
-%{_libdir}/gnome-keyring/standalone/*.so
 
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
@@ -200,6 +209,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %endif
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- add BuildRequires: openssl-devel, p11-kit-devel, libcap-ng-devel
+- add Patch3 (gnome-keyring-3.1.4-git20110729.patch)
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 

+ 8 - 2
g/gnome-menus/gnome-menus-vl.spec

@@ -3,12 +3,12 @@
 Summary:  A menu system for the GNOME project
 Summary(ja): GNOMEプロジェクト用メニューシステム
 Name: gnome-menus
-Version: 2.30.5
+Version: 3.0.1
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.30/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/3.0/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, glib2-devel
@@ -18,6 +18,9 @@ Requires: python
 Requires: pygtk2
 Requires: vine-menus >= 3.0
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
@@ -91,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-1
+- new upstream release
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.5-1
 - new upstream release
 

+ 17 - 5
g/gnome-nettool/gnome-nettool-vl.spec

@@ -1,20 +1,20 @@
-%define gtk2_version 2.22.0
+%define gtk3_version 3.0.9
 %define gconf2_version 2.32.0
 
 Summary: GNOME interface for various networking tools
 Summary(ja): さまざまなネットワークツールのGNOMEインターフェース
 Name: gnome-nettool
-Version: 2.32.0
+Version: 3.0.0
 Release: 1%{?_dist_release}
 
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/2.32/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/3.0/%{name}-%{version}.tar.bz2
 
 Group: Applications/System
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-nettool
 License: GPL
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: libgtop2-devel
 BuildRequires: desktop-file-utils
@@ -28,6 +28,10 @@ Requires(post): scrollkeeper
 Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 GNOME Nettool is a set of front-ends to various networking command-line
 tools, like ping, netstat, ifconfig, whois, traceroute, finger.
@@ -46,7 +50,7 @@ GNOME Nettoolは、ping、netstat、ifconfig、whois、traceroute、fingerとい
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications				\
@@ -76,6 +80,10 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor ||:
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-nettool.gschema.xml
 %{_datadir}/gnome-nettool
 %{_datadir}/gnome/help/gnome-nettool/
 %{_datadir}/omf/gnome-nettool/
@@ -92,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 

+ 120 - 0
g/gnome-online-accounts/gnome-online-accounts-vl.spec

@@ -0,0 +1,120 @@
+%define         package_version 3.1.1
+%define         package_release 1%{?_dist_release}
+
+Name:           gnome-online-accounts
+Version:        %{package_version}
+Release:        %{package_release}
+Summary:        GNOME applications and libraries to access the user's online accounts
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.clutter-project.org/
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	glib2-devel
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	gtk3-devel
+BuildRequires:	WebKit3-gtk-devel
+BuildRequires:	json-glib-devel
+BuildRequires:	libgnome-keyring-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	rest-devel
+BuildRequires:	gtk-doc
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+Gnome-online-accounts provides interfaces so applications and
+libraries in GNOME can access the user's online accounts
+
+%package devel
+Summary:        Development tools for gnome-online-accounts
+Summary(ja):    gnome-online-accounts の開発環境
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       gtk3-devel
+
+%description devel
+Header files and libraries for building a extension library for the
+gnome-online-accounts.
+
+
+%package        doc
+Summary:        Documentation for gnome-online-accounts
+Summary(ja):    gnome-online-accounts 用のドキュメント
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:	noarch
+
+
+%description    doc
+This package contains documentation for gnome-online-accounts.
+
+
+%prep
+%setup -q
+
+%build
+%configure \
+	--enable-gtk-doc \
+	--disable-static \
+	--enable-introspection=yes
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+#make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL="%{__install} -p -c"
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog AUTHORS COPYING NEWS README
+%{_libdir}/*.so.*
+%{_libexecdir}/goa-daemon
+%{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_mandir}/man8/goa-daemon.8.gz
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/goa-1.0
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/goa
+
+
+%changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.1-1
+- initial build for Vine Linux
+

+ 47 - 76
g/gnome-panel/gnome-panel-vl.spec

@@ -2,13 +2,13 @@
 
 %define gettext_package gnome-panel-2.0
 
-%define gnome_desktop_version 2.32.1
-%define glib2_version 2.26.1
-%define gtk2_version 2.22.1
+%define gnome_desktop3_version 3.0.0
+%define glib2_version 2.26.0
+%define gtk2_version 2.22.0
 %define libgnome_version 2.32.0
 %define libbonoboui_version 2.24.4
 %define orbit_version 2.14.19
-%define libwnck_version 2.30.5
+%define libwnck3_version 3.0.0
 %define gconf_version 2.32.0
 %define gnome_menus_version 2.30.4
 %define evolution_data_server_version 2.32.0
@@ -23,42 +23,25 @@
 Summary: GNOME panel
 Summary(ja): GNOME パネル
 Name: gnome-panel
-Version: 2.32.1
-Release: 4%{_dist_release}
+Version: 3.0.2
+Release: 1%{_dist_release}
 URL: http://www.gnome.org/
 License: GPL 
 Group: User Interface/Desktops
 
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
 # Remove this line and next line when upstream adopt Source1
-# clock.gnome-2.32ja.po
-#  (http://l10n.gnome.org/POT/gnome-panel.master/docs/clock.master.ja.po)
 Source1: clock.gnome-2-32.ja.po
 Source2: vine6-panel-default-setup.entries
 Source5: vine-panel-backwards-compat-config.schemas
 Source10: add-translations.sh
 Source12: gnome-compiler-flags.m4
 
-Patch0: gnome-panel-2.28.0-vendor.patch
-Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.28.0-about-vine.patch
-
-# the next three patches belong together
-# http://bugzilla.gnome.org/show_bug.cgi?id=470966
-Patch8: launcher-desktop-files.patch
-Patch9: desktop-file-monitoring.patch
-Patch10: preferred-apps.patch
-
-# don't pop up an error dialog if an applet from the 
-# default configuration is missing; we don't want to
-# add a hard dependency on e.g. tomboy 
-Patch11: applet-error.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: %{name}-libs = %{version}-%{release}
-Requires: gnome-desktop >= %{gnome_desktop_version}
-Requires: libwnck >= %{libwnck_version}
+Requires: gnome-desktop3 >= %{gnome_desktop3_version}
+Requires: libwnck3 >= %{libwnck3_version}
 Requires: gnome-menus >= %{gnome_menus_version}
 Requires: vine-menus >= 1.1
 Requires(post,postun): scrollkeeper, gtk2
@@ -77,11 +60,11 @@ BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: scrollkeeper
 BuildRequires: libxslt
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
+BuildRequires: libwnck3-devel >= %{libwnck3_version}
 BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: cairo-devel >= %{cairo_version}
@@ -104,8 +87,11 @@ BuildRequires: polkit-gnome-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: libSM-devel
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires: dconf-devel
 BuildRequires(install): desktop-file-utils
 
+Obsoletes: gnome-netstatus < 2.29
+
 %description
 
 The GNOME panel provides the window list, workspace switcher, menus, and other 
@@ -154,29 +140,21 @@ cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE12} m4
 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 
-%patch0 -p1 -b .vendor
-%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .about-vine
-%patch8 -p1 -b .launcher-desktop-files
-%patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p1 -b .preferred-apps
-## %patch11 -p1 -b .applet-error
-
-libtoolize --force --copy
-
 . %{SOURCE10}
 
 %build
 # gpm-integration patches Makefile.am and configure.in
-aclocal -I m4
-automake --add-missing
-autoheader
-autoconf
+#aclocal -I m4
+#automake --add-missing
+#autoheader
+#autoconf
+autoreconf -if
 %configure --disable-scrollkeeper \
            --disable-schemas-install \
            --disable-gtk-doc \
            --with-in-process-applets=clock:fish \
 	   --enable-introspection=yes \
+	   --enable-telepathy-glib=yes \
 %if %{use_eds}
            --enable-eds=yes
 %else
@@ -195,8 +173,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 # Create pager and tasklist schemas for compatibility with older
 # configurations which reference the old schema names
 #
-sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/prefs/|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/window-list.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/tasklist.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
+#sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/prefs/|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/window-list.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/tasklist.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
@@ -233,19 +211,15 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /app
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel > /dev/null || :
 
 # install schemas
-SCHEMAS="clock.schemas fish.schemas pager.schemas \
-        panel-compatibility.schemas panel-general.schemas \
-        panel-global.schemas panel-object.schemas panel-toplevel.schemas \
-        tasklist.schemas window-list.schemas workspace-switcher.schemas"
+SCHEMAS="clock.schemas"
 for S in $SCHEMAS; do
     echo %{_sysconfdir}/gconf/schemas/$S ; done \
-    | xargs gconftool-2 --makefile-install-rule >& /dev/null ||:
+    | 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/panel-default-setup.entries > /dev/null || :
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || :
+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 || :
@@ -253,25 +227,19 @@ scrollkeeper-update > /dev/null 2>&1 || :
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="clock.schemas fish.schemas pager.schemas \
-          panel-compatibility.schemas panel-general.schemas \
-          panel-global.schemas panel-object.schemas panel-toplevel.schemas \
-          tasklist.schemas window-list.schemas workspace-switcher.schemas"
+  SCHEMAS="clock.schemas"
   for S in $SCHEMAS; do
       echo %{_sysconfdir}/gconf/schemas/$S ; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null ||:
+      | 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 fish.schemas pager.schemas \
-          panel-compatibility.schemas panel-general.schemas \
-          panel-global.schemas panel-object.schemas panel-toplevel.schemas \
-          tasklist.schemas window-list.schemas workspace-switcher.schemas"
+  SCHEMAS="clock.schemas"
   for S in $SCHEMAS; do
       echo %{_sysconfdir}/gconf/schemas/$S ; done \
-      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null ||:
+      | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null 2>&1 ||:
 fi
 
 %postun
@@ -285,40 +253,43 @@ fi
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
-%{_datadir}/gnome-panel
-%exclude %{_datadir}/gnome-panelrc
-%{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/gnome-2.0/ui/*
-%{_mandir}/man*/*
 %{_bindir}/*
 %exclude %{_bindir}/panel-test-applets
 %{_libexecdir}/*
-%{_libdir}/gnome-panel/modules/libpanel-applets-bonobo.*
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_sysconfdir}/gconf/schemas/*.entries
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/gnome-panel
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%{_mandir}/man*/*
 
 %files libs
 %{_libdir}/*.so.*
-%{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %{_bindir}/panel-test-applets
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/gnome-panel-3.0
-%{_includedir}/panel-2.0
+%{_includedir}/gnome-panel*
 %{_libdir}/*.so
 %{_datadir}/gtk-doc
-%{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/*.gir
 
 
 %changelog
-* Fri Jun 03 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.1-4
+* Sat Aug 12 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.2-1
+- new upstream release
+- drop old Patches
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- change BuildRequires: libwnck3-devel instead of libwnck-devel
+- add BuildRequires: dconf-devel
+- add Obsoletes: gnome-netstatus 
+
+* Thu Jun 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.1-4
 - update SOURCE2(vine6-panel-default-setup.entries)
   - remove bottom panel
   - move window_list and workspace_switcher applet to top panel

+ 48 - 74
g/gnome-power-manager/gnome-power-manager-vl.spec

@@ -5,13 +5,13 @@
 Summary: GNOME power management service
 Summary(ja): GNOME 電源管理ツール
 Name: gnome-power-manager
-Version: 2.32.0
-Release: 2%{?_dist_release}
+Version: 3.1.3
+Release: 1%{?_dist_release}
 License: GPLv2+ and GFDL
 Group: Applications/System
 URL: http://projects.gnome.org/gnome-power-manager/
 
-Source0: http://download.gnome.org/sources/gnome-power-manager/2.32/gnome-power-manager-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-power-manager/3.1/gnome-power-manager-%{version}.tar.xz
 # ja.po from l10n
 Source101: gnome-power-manager.gnome-2-32.ja.po
 
@@ -21,6 +21,7 @@ Patch11: gnome-power-manager-2.28.2-math.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf >= 2.65
+BuildRequires: gtk3-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -33,24 +34,28 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: cairo-devel
-BuildRequires: libcanberra-devel >= 0.10
-BuildRequires: unique-devel >= 1.1.6
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: unique3-devel >= 3.0.0
 ## BuildRequires: DeviceKit-power-devel >= 008
 BuildRequires: upower-devel >= 0.9.0
+BuildRequires: control-center-devel
 BuildRequires: intltool
 BuildRequires: docbook-utils
-Requires: gtk2 >= 2.10.0
+Requires: gtk3 >= 3.0.0
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: libnotify >= 0.4.3
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: dbus-x11 >= %{dbus_version}
-Requires: libcanberra-gtk2 >= 0.10
-Requires: unique >= 1.1.6
+Requires: libcanberra-gtk3 >= 0.10
+Requires: unique3 >= 3.0.0
 Requires: upower >= 0.9.0
 Requires(post,postun): scrollkeeper
 Requires(post,pre,preun): GConf2
 
+Obsoletes: gnome-power-manager-extra < 3.0.0
+Provides:  gnome-power-manager-extra
+
 Vendor:       Project Vine
 Distribution: Vine Linux
 Packager:     daisuke, Takemikaduchi
@@ -61,14 +66,6 @@ displaying icons and handling user callbacks in an interactive GNOME session.
 GNOME Power Preferences allows authorised users to set policy and
 change preferences.
 
-%package extra
-Summary: GNOME Power Manager extra utility programs
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-
-%description extra
-Extra GNOME power management applications that are not normally needed.
-
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
@@ -76,9 +73,9 @@ Extra GNOME power management applications that are not normally needed.
 ## %patch11 -p1 -b .math
 
 # copy ja.po
-cp -f %{SOURCE101} po/ja.po
+#cp -f %{SOURCE101} po/ja.po
 
-autoreconf -i
+# autoreconf -i
 
 %build
 %configure \
@@ -88,14 +85,14 @@ make
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
-  msgmerge $p %{name}.pot > $p.out
-  msgfmt -o `basename $p .po`.gmo $p.out
-done
+#cd po
+#grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
+#mv POTFILES.keep POTFILES.in
+#intltool-update --pot
+#for p in *.po; do
+#  msgmerge $p %{name}.pot > $p.out
+#  msgfmt -o `basename $p .po`.gmo $p.out
+#done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,9 +100,9 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 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
+#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}
@@ -129,76 +126,53 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null || :
 scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-power-manager.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/gnome-power-manager.schemas > /dev/null || :
-fi
-
 %postun
 scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
-%{_bindir}/gnome-power-bugreport.sh
-%{_bindir}/gnome-power-manager
-%{_bindir}/gnome-power-preferences
+#%{_sysconfdir}/xdg/autostart/*.desktop
+#%{_bindir}/gnome-power-manager
+%{_bindir}/gnome-power-statistics
 %{_sbindir}/gnome-power-backlight-helper
 %dir %{_datadir}/gnome-power-manager
 %{_datadir}/gnome-power-manager/acme.ui
-%{_datadir}/gnome-power-manager/gpm-prefs.ui
 %{_datadir}/gnome-power-manager/gpm-feedback-widget.ui
-%{_mandir}/man1/gnome-power-manager.1.gz
-%{_mandir}/man1/gnome-power-preferences.1.gz
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/dbus-1/services/gnome-power-manager.service
-#%{_datadir}/omf/gnome-power-manager
-%{_sysconfdir}/xdg/autostart/*.desktop
+%{_datadir}/gnome-power-manager/gpm-statistics.ui
+%{_datadir}/GConf/gsettings/org.gnome.power-manager.gschema.migrate
+%{_datadir}/applications/gnome-power-statistics.desktop
+#%{_datadir}/dbus-1/services/gnome-power-manager.service
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/gnome-power-manager/icons/hicolor/*/*/*.*
-%{_datadir}/icons/hicolor/*/apps/gnome-power-manager.*
-%{_datadir}/applications/gnome-power-preferences.desktop
-%{_libexecdir}/gnome-brightness-applet
-%{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
-%{_datadir}/icons/hicolor/*/apps/gnome-brightness-applet.*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/gnome/scalable/status/keyboard-brightness-symbolic.svg
 %{_datadir}/polkit-1/actions/org.gnome.power.policy
-
-%files extra
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
-%{_bindir}/gnome-power-statistics
+#%{_mandir}/man1/gnome-power-manager.1.gz
 %{_mandir}/man1/gnome-power-statistics.1.gz
-%{_datadir}/gnome-power-manager/gpm-statistics.ui
-%{_datadir}/applications/gnome-power-statistics.desktop
-%{_datadir}/icons/hicolor/*/apps/gnome-power-statistics.*
-%{_libexecdir}/gnome-inhibit-applet
-%{_libdir}/bonobo/servers/GNOME_InhibitApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
-%{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.3-1
+- new upstream release
+- add BuildRequires: gtk3-devel, control-center-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of licanberra-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- delete -extra sub package
+
 * Sat Oct 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-2
 - add Source101(gnome-power-manager.gnome-2-32.ja.po)
 

+ 21 - 37
g/gnome-screensaver/gnome-screensaver-vl.spec

@@ -1,11 +1,11 @@
 %define _dbus_ver		1.4.0
 %define _gconf_ver		2.32.0
-%define _gtk_ver		2.22.0
+%define _gtk_ver		3.0.0
 %define _glib_ver		2.26.0
 %define _libgnomekbd_ver	2.32.0
 %define _libglade_ver		2.6.0
 %define _libgnome_menu_ver	2.30.4
-%define _gnome_desktop_ver	2.32.0
+%define _gnome_desktop_ver	3.0.0
 %define _libexif_ver		0.6.12
 
 %define xscreensaverdir %{_datadir}/control-center/screensavers
@@ -13,27 +13,27 @@
 Summary:	GNOME Screensaver
 Summary(ja):	GNOME スクリーンセーバー
 Name:		gnome-screensaver
-Version:	2.30.2
+Version:	3.0.0
 Release:	1%{?_dist_release}
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://live.gnome.org/GnomeScreensaver/
 
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.30/gnome-screensaver-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/3.0/gnome-screensaver-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel >= %{_gtk_ver}
+BuildRequires:	gtk3-devel >= %{_gtk_ver}
 BuildRequires:	glib2-devel >= %{_glib_ver}
 BuildRequires:	dbus-devel >= %{_dbus_ver}
 BuildRequires:	GConf2-devel >= %{_gconf_ver}
 BuildRequires:	libgnomekbd-devel >= %{_libgnomekbd_ver}
 BuildRequires:	libglade2-devel >= %{_libglade_ver}
 BuildRequires:	gnome-menus-devel >= %{_libgnome_menu_ver}
-BuildRequires:	gnome-desktop-devel >= %{_gnome_desktop_ver}
+BuildRequires:	gnome-desktop3-devel >= %{_gnome_desktop_ver}
 BuildRequires:	libexif-devel >= %{_libexif_ver}
 BuildRequires:	pam-devel
 BuildRequires:	libX11-devel, libXScrnSaver-devel, libXext-devel
@@ -81,31 +81,23 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
-  --add-only-show-in GNOME                                              \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+#desktop-file-install --vendor gnome --delete-original                   \
+#  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
+#  --add-only-show-in GNOME                                              \
+#  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 %find_lang %{name}
 
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.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/gnome-screensaver.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/gnome-screensaver.schemas >/dev/null
-fi
 
 %clean
 %__rm -rf %{buildroot}
@@ -113,27 +105,19 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/xdg/menus/preferences-post-merged/*
-%{_sysconfdir}/xdg/menus/*.menu
 %{_sysconfdir}/xdg/autostart/gnome-screensaver.desktop
-%{_bindir}/*
-%{_libexecdir}/*
+%{_bindir}/gnome-screensaver
+%{_bindir}/gnome-screensaver-command
+%{_libexecdir}/gnome-screensaver-dialog
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
-%{_datadir}/applications/screensavers/*.desktop
-%{_datadir}/backgrounds/cosmos
-%{_datadir}/desktop-directories/*.directory
-%dir %{_datadir}/gnome-background-properties
-%{_datadir}/gnome-background-properties/cosmos.xml
-#%{_datadir}/pixmaps/backgrounds/*
-%{_datadir}/pixmaps/*.svg
-%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+
 * Tue Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-1
 - new upstream release
 - remove BuildRequires: gnome-vfs2-devel, libgnomeui-devel

+ 31 - 25
g/gnome-session/gnome-session-vl.spec

@@ -1,23 +1,23 @@
-%define glib2_version 2.26.1
-%define pango_version 1.28.3
-%define gtk2_version 2.22.1
-%define gconf2_version 2.32.0
+%define glib2_version 2.28.6
+%define pango_version 1.28.4
+%define gtk3_version 3.0.9
+%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 po_package gnome-session-2.0
+%define po_package gnome-session-3.0
 
 Summary: GNOME session manager
 Summary(ja): GNOME セッションマネージャ
 Name: gnome-session
-Version: 2.32.1
+Version: 3.1.3
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org/
 License: GPLv2+ 
 Group: User Interface/Desktops
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.1/%{name}-%{version}.tar.xz
 Source1: vine-default-session
 Source2: gnome.desktop 
 Source3: gnome-session.gnome-2-32.ja.po
@@ -32,6 +32,7 @@ BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
+BuildRequires: librsvg2-devel
 BuildRequires: usermode
 BuildRequires: startup-notification-devel
 BuildRequires: libSM-devel
@@ -44,6 +45,11 @@ Requires(preun): GConf2 >= %{gconf2_version}
 Conflicts: gdm < 2.4.0.7
 Requires: vine-backgrounds >= 3.8
 Requires: control-center
+Requires: gsettings-desktop-schemas
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 %description
 gnome-session manages a GNOME desktop session. It starts up the other core 
@@ -52,7 +58,7 @@ GNOME components and handles logout and saving the session.
 
 %prep
 %setup -q
-cp %{SOURCE3} po/ja.po
+#cp %{SOURCE3} po/ja.po
 
 %build
 #sed -i -e 's/GNOME_COMPILE_WARNINGS.*//' configure.in
@@ -76,7 +82,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original                   \
@@ -108,34 +114,29 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas > /dev/null ||:
+%post -p /sbin/ldconfig
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas >& /dev/null || :
-fi
+%postun
+/sbin/ldconfig
+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/gnome-session.schemas >& /dev/null || :
-fi
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
-%postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 #doc %{_docdir}/%{name}/dbus/gnome-session.html
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/autostart
 %{_bindir}/*
+%{_libexecdir}/gnome-session-check-accelerated
+%{_libexecdir}/gnome-session-check-accelerated-helper
+%{_datadir}/GConf/gsettings/gnome-session.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 %{_datadir}/gnome
 %{_datadir}/gnome-session/*.ui
+%{_datadir}/gnome-session/sessions/*
 %{_datadir}/applications/*
 %{_datadir}/xsessions/*
 %dir %{_datadir}/pixmaps/splash
@@ -144,6 +145,11 @@ fi
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.3-1
+- new upstream release
+- add BuildRequires: librsvg2-devel
+- add Requires: gsettings-desktop-schemas
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 

+ 47 - 86
g/gnome-settings-daemon/gnome-settings-daemon-vl.spec

@@ -2,29 +2,13 @@ Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 Summary(ja):	GNOME から GTK+/KDE のアプリケーションで設定を共有するためのデーモン
 
 Name:		gnome-settings-daemon
-Version:	2.32.1
+Version:	3.1.4
 Release:	1%{?_dist_release}
 
 Group:		System Environment/Daemons
 License:	GPLv2+
 URL:		http://ftp.gnome.org/pub/gnome/sources/%{name}
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
-
-# from fedora
-# https://bugzilla.gnome.org/show_bug.cgi?id=596136
-Patch0: 0002-Use-a-rounded-instead-of-curved-rectangle.patch
-Patch1: 0003-Improve-the-media-keys-overlay-design.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=567249
-Patch4: 0001-Fix-bluriness-in-level-bar-and-popup.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=498249
-Patch2: left-handed-touchpad.patch
-
-# change font rendering
-Patch3: slight-hinting.patch
-
-# vine
-Patch100:	gnome-settings-daemon-2.28.1-default-font-setting.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/3.1/%{name}-%{version}.tar.xz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -34,8 +18,8 @@ Requires(post): GConf2 >= 2.14
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	GConf2-devel
-BuildRequires:	gtk2-devel
-BuildRequires:	gnome-desktop-devel >= 2.32.0
+BuildRequires:	gtk3-devel
+BuildRequires:	gnome-desktop3-devel >= 3.0.0
 BuildRequires:	libgnome-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXrandr-devel
@@ -49,6 +33,18 @@ BuildRequires:  libnotify-devel >= 0.4.3
 BuildRequires:	gettext
 BuildRequires:	perl-XML-Parser
 BuildRequires:	libSM-devel
+BuildRequires:	libgudev1-devel
+BuildRequires:	nss-devel
+BuildRequires:	polkit-devel
+BuildRequires:	cups-devel
+BuildRequires:	upower-devel >= 0.9.12
+BuildRequires:	libcanberra-gtk3-devel
+BuildRequires:	colord-devel
+BuildRequires:	lcms2-devel
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -67,16 +63,14 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-## %patch4 -p1 -b .blurry
-## %patch0 -p1 -b .osd-rounded-rectangle
-## %patch1 -p1 -b .osd-visual-refresh
-## %patch2 -p1 -b .left-handed-touchpad
-%patch3 -p1 -b .slight-hinting
-
-%patch100 -p1 -b .defaults
 
 %build
-%configure --enable-static=no --enable-profiling --disable-esd
+%configure \
+	--disable-static \
+	--disable-profiling \
+	--enable-pulse \
+	--disable-packagekit
+	
 make %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
@@ -102,88 +96,55 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-	%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
-	%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
-	>& /dev/null || :
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
   
-%pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
-			>& /dev/null || :
-	fi
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
-			>& /dev/null || :
-	fi
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-		%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
-		%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
-		>& /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
-			>& /dev/null || :
-	fi
-	if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
-			>& /dev/null || :
-	fi
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
-		%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-		%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
-		%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
-		>& /dev/null || :
-fi
-
 %postun
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
   
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
+%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
-%{_libdir}/gnome-settings-daemon-2.0
-%{_libexecdir}/gnome-settings-daemon
-%{_libexecdir}/gsd-locate-pointer
-%{_datadir}/gnome-settings-daemon/
+%{_libdir}/gnome-settings-daemon-3.0
+%{_libexecdir}/*
+%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
 %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
+%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/gnome-settings-daemon/
+%{_datadir}/gnome-settings-daemon-3.0/
 %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.*
 %{_datadir}/icons/hicolor/*/actions/touchpad*
-%{_datadir}/gnome-control-center/keybindings/*.xml
+%{_mandir}/man1/gnome-settings-daemon.1.gz
+%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/gnome-settings-daemon-2.0
+%{_includedir}/gnome-settings-daemon-3.0
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- add BuildRequires: libgudev1-devel, nss-devel, polkit-devel, cups-devel, upower-devel
+                     libcanberra-gtk3-devel, colord-devel, lcms2-devel
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- drop all Patches
+- fix configure option
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.1-1
 - new upstream release
 

+ 265 - 0
g/gnome-shell-extensions/gnome-shell-extensions-vl.spec

@@ -0,0 +1,265 @@
+Name:           gnome-shell-extensions
+Version:        3.1.4
+Release:        1%{?_dist_release}
+Summary:        Modify and extend GNOME Shell functionality and behavior
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+URL:            http://live.gnome.org/GnomeShell/Extensions
+
+Source0:        gnome-shell-extensions-%{version}.tar.xz
+
+BuildRequires:  gnome-common
+BuildRequires:  intltool
+BuildRequires:  glib2-devel
+
+Requires:       gnome-shell >= 3.1.4
+BuildArch:      noarch
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+GNOME Shell Extensions is a collection of extensions providing additional 
+and optional functionality to GNOME Shell.
+
+Enabled extensions:
+
+  * alternate-tab
+  * alternative-status-menu
+  * dock
+  * windowsNavigator
+  * user-theme
+  * auto-move-windows
+  * drive-menu
+  * places-menu
+  * native-window-placement
+# TODO: uncomment when enabling systemMonitor
+#  * systemMonitor
+
+%package        common
+Summary:        Files common to GNOME Shell Extensions
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+%description    common
+GNOME Shell Extensions is a collection of extensions providing additional 
+and optional functionality to GNOME Shell. Common files and directories 
+needed by extensions are provided here.
+
+%package        alternate-tab
+Summary:        Classic Alt+Tab behavior. Window based instead of app based
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    alternate-tab
+Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.  
+GNOME Shell groups multiple instances of the same application together. 
+This extension disables grouping.  
+
+%package        alternative-status-menu
+Summary:        For those who want a power off item visible at all the time
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    alternative-status-menu
+For those who want a power off item visible at all the time, replaces 
+GNOME Shell status menu with one featuring separate Suspend and Power Off. 
+Adds the ability to hibernate as well.
+
+%package        dock
+Summary:        Shows a dock-style task switcher permanently
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    dock
+Shows a dock-style task switcher on the right side of the screen permanently.
+
+%package        windowsNavigator
+Summary:        Keyboard selection of windows and work-spaces in overlay mode
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    windowsNavigator
+Allow keyboard selection of windows and work-spaces in overlay mode in 
+GNOME Shell.  Switch to overview mode (press the windows or alt+f1 key) and 
+press the alt key to show numbers over windows.  Press any number to switch
+to the corresponding window.
+
+%package        user-theme
+Summary:        Lets the user select a custom theme for the shell
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    user-theme
+Lets the user select a custom theme for the Gnome shell. It will allow you to 
+apply a style from /.themes/[themeName]/gnome-shell/gnome-shell.css
+
+%package        auto-move-windows
+Summary:        Assign specific workspaces to applications
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    auto-move-windows
+Lets you manage your workspaces more easily, assigning a specific workspace to
+each application as soon as it creates a window, in a manner configurable with a
+GSettings key.
+
+%package        drive-menu
+Summary:        Disk device manager in the system status area
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    drive-menu
+Adds a menu in the system status area that tracks removable disk devices
+attached and offers to browse them and eject/unmount them.
+
+%package        places-menu
+Summary:        Places menu indicator in the system status area
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    places-menu
+Adds a menu in the system status area that resembles the Places menu from
+GNOME 2.x
+
+%package        native-window-placement
+Summary:        Arrange windows in overview in a more native way
+Group:          User Interface/Desktops
+License:        GPLv2+ 
+Requires:       %{name}-common = %{version}-%{release}
+
+%description    native-window-placement
+This extension employs an algorithm (taken from KDE) for layouting the
+thumbnails in the overview that more closely reflects the positions and relative
+sizes of the actual windows, instead of using a fixed grid.
+
+# TODO: uncomment when enabling systemMonitor
+#%package        systemMonitor
+#Summary:        Monitor your system status
+#Group:          User Interface/Desktops
+#License:        GPLv2+ 
+#Requires:       %{name}-common = %{version}-%{release}
+#
+#%description    systemMonitor
+#Monitor your system status
+
+%prep
+%setup -q
+
+%build
+# since we build from a git checkout
+[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh 
+
+# TODO: once libgtop2 >= 2.28.4 is available, enable systemMonitor extension
+# TODO: once gjs >= 0.7.15 is available, enable xrand-indicator extension
+%configure  --enable-extensions="alternate-tab alternative-status-menu dock windowsNavigator user-theme auto-move-windows drive-menu places-menu native-window-placement"
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name}
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README
+%dir %{_datadir}/gnome-shell/extensions/
+
+%files alternate-tab
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.alternate-tab.gschema.xml
+%{_datadir}/gnome-shell/extensions/alternate-tab*
+
+%files alternative-status-menu
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/alternative-status-menu*
+
+%files dock
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
+%{_datadir}/gnome-shell/extensions/dock*
+
+%files windowsNavigator
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/windowsNavigator*
+
+%files user-theme
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
+%{_datadir}/gnome-shell/extensions/user-theme*
+
+%files auto-move-windows
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
+%{_datadir}/gnome-shell/extensions/auto-move-windows*
+
+%files drive-menu
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/drive-menu*
+
+%files places-menu
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/places-menu*
+
+%files places-menu
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/places-menu*
+
+%files auto-move-windows
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
+%{_datadir}/gnome-shell/extensions/auto-move-windows*
+
+%files native-window-placement
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
+%{_datadir}/gnome-shell/extensions/native-window-placement*
+
+# TODO: uncomment when enabling systemMonitor
+#%files systemMonitor
+#%defattr(-,root,root,-)
+#%{_datadir}/gnome-shell/extensions/systemMonitor*
+
+%posttrans user-theme
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun user-theme
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%posttrans auto-move-windows
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun auto-move-windows
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%posttrans native-window-placement
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun native-window-placement
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%posttrans dock
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun dock
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%posttrans alternate-tab
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun alternate-tab
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- initial build for Vine Linux
+

+ 50 - 17
g/gnome-shell/gnome-shell-vl.spec

@@ -1,11 +1,17 @@
-%define pkg_version 2.29.1
-%define pkg_release 2%{?_dist_release}
+%define pkg_version 3.1.4
+%define pkg_release 1%{?_dist_release}
 
 Summary:     Window management and application launching for GNOME
 Name:        gnome-shell
 Version:     %{pkg_version}
 Release:     %{pkg_release}
-Source0:     %{name}-%{version}.tar.bz2
+Source0:     %{name}-%{version}.tar.xz
+
+# settings for Vine
+Patch101:    gnome-shell-vine-settings.patch
+Patch102:    gnome-shell-vine-customize.patch
+Patch103:    gnome-shell-3.1.4-ja.po.patch
+
 License:     GPLv2+
 Group:       User Interface/Desktops
 URL:         http://live.gnome.org/GnomeShell
@@ -24,7 +30,7 @@ BuildRequires: gtk2-devel
 BuildRequires: clutter-devel
 BuildRequires: mutter-devel
 BuildRequires: gjs-devel
-BuildRequires: gnome-desktop-devel
+BuildRequires: gnome-desktop3-devel
 BuildRequires: gnome-menus-devel
 BuildRequires: libSM-devel
 BuildRequires: libffi-devel
@@ -32,13 +38,15 @@ BuildRequires: GConf2-devel
 BuildRequires: startup-notification-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: desktop-file-utils
-BuildRequires: xulrunner-devel
 BuildRequires: libcroco-devel
 BuildRequires: librsvg2-devel
-BuildRequires: gir-repository-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gstreamer-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: telepathy-logger-devel
+BuildRequires: polkit-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: evolution-data-server-devel
 BuildRequires: intltool
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -49,12 +57,18 @@ Packager: Takemikaduchi
 
 
 %description
-GNOME Shell is the defining technology of the GNOME 3 desktop user experience. It provides core interface functions like switching to windows and launching applications. GNOME Shell takes advantage of the capabilities of modern graphics hardware and introduces innovative user interface concepts to provide a delightful and easy to use experience. 
+GNOME Shell is the defining technology of the GNOME 3 desktop user experience.
+It provides core interface functions like switching to windows and launching
+applications. GNOME Shell takes advantage of the capabilities of modern graphics
+hardware and introduces innovative user interface concepts to provide a delightful
+and easy to use experience. 
 
 
 %prep
 %setup -q
-
+%patch101 -p1 -b .vine
+%patch102 -p1 -b .vine
+%patch103 -p1 -b .old_po
 
 %build
 %configure --disable-static
@@ -65,9 +79,10 @@ GNOME Shell is the defining technology of the GNOME 3 desktop user experience. I
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 %find_lang %{name}
 
-%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
@@ -79,14 +94,13 @@ GNOME Shell is the defining technology of the GNOME 3 desktop user experience. I
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/gnome-shell.schemas \
-  > /dev/null || :
-/sbin/ldconfig
+    > /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%pre 
+%pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
@@ -94,7 +108,7 @@ if [ "$1" -gt 1 ]; then
     > /dev/null || :
 fi
 
-%preun 
+%preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
@@ -109,21 +123,40 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README
+%doc COPYING NEWS README
+%{_sysconfdir}/gconf/schemas/gnome-shell.schemas
 %{_bindir}/gnome-shell
+%{_bindir}/gnome-shell-extension-tool
 %{_libdir}/gnome-shell/*
-%{_libdir}/mutter/plugins/*
-%{_datadir}/applications/*
+%{_libexecdir}/gnome-shell-calendar-server
+%{_libexecdir}/gnome-shell-hotplug-sniffer
+%{_libexecdir}/gnome-shell-perf-helper
+%{_datadir}/applications/gnome-shell.desktop
+%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
+%{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/gnome-shell/*
 %{_datadir}/man/man1/*.1.gz
-%{_sysconfdir}/gconf/schemas/*
 
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- new upstream release
+- add BuildRequires: telepathy-logger-devel, polkit-devel, pulseaudio-libs-devel, evolution-data-server-devel
+- change BuildRequires: gnome-desktop3-devel instead of gnome-desktop-devel
+- remove BuildRequires: xulrunner-devel
+- add Patch101 (gnome-shell-vine-settings.patch)
+- add Patch102 (gnome-shell-vine-customize.patch)
+- add Patch103 (gnome-shell-3.1.4-ja.po.patch)
+
 * Sun May 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.29.1-2
 - add Requires: mutter
 

+ 22 - 24
g/gnome-system-monitor/gnome-system-monitor-vl.spec

@@ -2,12 +2,12 @@
 
 %define glib2_version 2.26.0
 %define gconf_version 2.32.0
-%define libwnck_version 2.30.5
+%define libwnck3_version 3.0.0
 %define libgtop2_version 2.28.2
-%define gtk2_version 2.22.0
+%define gtk3_version 3.0.0
 %define gnome_icon_theme_version 2.30.0
 %define glibmm_version 2.22.0
-%define gtkmm2_version 2.22.0
+%define gtkmm3_version 3.0.0
 %define libxml2_version 2.7.7
 %define librsvg2_version 2.32.0
 %define desktop_file_utils_version 0.10
@@ -15,12 +15,12 @@
 Summary: Gnome system monitor
 Summary(ja): GNOMEシステムモニタ
 Name: gnome-system-monitor
-Version: 2.28.2
+Version: 3.1.3
 Release: 1%{?_dist_release}
 License: GPL
 
 Group: Applications/System
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post,postun): scrollkeeper
@@ -29,11 +29,11 @@ Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: libgtop2-devel >= %{libgtop2_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libwnck3-devel >= %{libwnck3_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: glibmm-devel >= %{glibmm_version}
-BuildRequires: gtkmm2-devel >= %{gtkmm2_version}
+BuildRequires: gtkmm3-devel >= %{gtkmm3_version}
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: librsvg2-devel >= %{librsvg2_version}
 BuildRequires: dbus-glib-devel
@@ -41,6 +41,10 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= 0.3.2
 Obsoletes: gtop
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
 %description
 gnome-system-monitor is a simple process and system monitor.
 
@@ -58,7 +62,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original       \
@@ -73,39 +77,33 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null
 scrollkeeper-update > /dev/null 2>&1 || :
 
 %posttrans
 update-desktop-database -q &> /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/gnome-system-monitor.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/gnome-system-monitor.schemas > /dev/null
-fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %postun
 scrollkeeper-update > /dev/null 2>&1 || :
 if [ $1 -eq 0 ] ; then
     update-desktop-database -q &> /dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%{_sysconfdir}/gconf/schemas/*
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/*.desktop
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/pixmaps/gnome-system-monitor
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.3-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: libwnck3-devel instead of libwnck-devel
+- change BuildRequires: gtkmm3-devel instead of gtkmm2-devel
+
 * Tue Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.2-1
 - new upstream release
 

+ 25 - 10
g/gnome-terminal/gnome-terminal-vl.spec

@@ -1,39 +1,44 @@
 %define gettext_package gnome-terminal
 
-%define glib2_version 2.26.1
-%define gtk2_version 2.22.1
-%define gconf2_version 2.32.0
-%define vte_version 0.26.2
+%define glib2_version 2.28.6
+%define gtk3_version 3.0.0
+%define gconf2_version 2.32.2
+%define vte_version 0.28.1
 %define startup_notification_version 0.8
 %define desktop_file_utils_version 0.10
 
 Summary: GNOME Terminal
 Summary(ja): GNOME ターミナル
 Name: gnome-terminal
-Version: 2.32.1
+Version: 3.0.1
 Release: 1%{?_dist_release}
 URL: http://www.gnome.org
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.32/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.0/%{name}-%{version}.tar.bz2
 Patch10: %{name}-2.22.0-i18n-help.patch
 
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Requires: vte >= %{vte_version}
+Requires: vte3 >= %{vte3_version}
 Requires(post,pre,preun): GConf2
 Obsoletes: gnome-terminal2
 
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: vte-devel >= %{vte_version}
+BuildRequires: vte3-devel >= %{vte3_version}
 BuildRequires: dbus-glib-devel
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libSM-devel
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: docbook-utils
+BuildRequires: gsettings-desktop-schemas
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
 
 %description
 
@@ -48,7 +53,11 @@ GNOME 端末エミュレータです。
 %patch10 -p1 -b .i18n-help
 
 %build
-%configure --with-widget=vte --disable-schemas-install --disable-scrollkeeper
+%configure \
+	--with-gtk=3.0 \
+	--with-widget=vte \
+	--disable-schemas-install \
+	--disable-scrollkeeper
 make %{?_smp_mflags}
 
 %install
@@ -99,6 +108,12 @@ fi
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-1
+- new upstream release
+- add BuildRequires: gsettings-desktop-schemas
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: vte3-devel instead of vte-devel
+
 * Sat Nov 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.32.1-1
 - new upstream release
 

+ 82 - 0
g/gnome-themes-standard/gnome-themes-standard-vl.spec

@@ -0,0 +1,82 @@
+Name: gnome-themes-standard
+Version: 3.1.4
+Release: 1%{?_dist_release}
+Summary: Standard themes for GNOME applications
+
+Group: User Interface/Desktops
+License: LGPLv2+
+URL: http://git.gnome.org/browse/gnome-themes-standard
+Source0: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
+
+BuildRequires: gtk3-devel >= 3.0.2
+BuildRequires: librsvg2-devel
+Requires: gtk2-engines gnome-icon-theme
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+The gnome-themes-standard package contains the standard theme for the GNOME
+desktop, which provides default appearance for cursors, desktop background,
+window borders and GTK+ applications.
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.la
+
+%find_lang %{name}
+
+%post
+touch --no-create %{_datadir}/icons/Adwaita &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    for t in  Adwaita HighContrast HighContrastInverse LowContrast; do
+        touch --no-create %{_datadir}/icons/$t &>/dev/null
+        gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
+    done
+fi
+
+%posttrans
+for t in  Adwaita HighContrast HighContrastInverse LowContrast; do
+  gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
+done
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING NEWS
+
+
+# Background WM, gtk2 themes, gtk3 themes
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.so
+%{_datadir}/themes/Adwaita
+
+# Background
+%{_datadir}/gnome-background-properties/*
+
+# A11y themes
+%{_datadir}/icons/LowContrast
+%{_datadir}/themes/LowContrast
+%{_datadir}/icons/HighContrast
+%{_datadir}/themes/HighContrast
+%{_datadir}/icons/HighContrastInverse
+%{_datadir}/themes/HighContrastInverse
+
+# Cursors
+%{_datadir}/icons/Adwaita
+
+
+
+%changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- initial build for Vine Linux
+

+ 27 - 11
g/gnome-themes/gnome-themes-vl.spec

@@ -1,32 +1,36 @@
 Summary: GNOME Themes collection
 Summary(ja): GNOME テーマコレクション
 Name: gnome-themes
-Version: 2.32.1
-Release: 5%{?_dist_release}
+Version: 3.0.0
+Release: 1%{?_dist_release}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 License: GPL/LGPL/CC
 Group: User Interface/Desktops
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.32/%{name}-%{version}.tar.bz2
-Source10: metatheme-vine-6.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/3.0/%{name}-%{version}.tar.bz2
+Source10: metatheme-vine-7.tar.bz2
 Source11: icon-theme-vine-6.tar.bz2
 Source12: cursor-theme-vine-6.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 
-BuildRequires: gtk2-engines-devel >= 2.20
-BuildRequires: gtk2-devel >= 2.21.7
+BuildRequires: gtk3-engines-devel >= 2.91
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: icon-naming-utils >= 0.8
 BuildRequires: pkgconfig
 
-Requires: gtk2-engines >= 2.10
-Conflicts: gtk2-engines < 2.2.0-0vl3
+Requires: gtk3-engines >= 2.91
 Requires: metacity >= 2.20.3-3vl6
-Conflicts: metacity < 2.4.34-0vl2
 Requires: gtk-xfce-engine >= 2.2
+Requires: gnome-themes-standard
+
 Conflicts: gnome-themes-extras < 0.8
-Requires(post): gtk2 >= 2.8.0
+
+Requires(post): gtk3 >= 3.0.0
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 Contains the base themes for Gnome desktop environment.
@@ -52,9 +56,15 @@ tar xzvf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/icons
 tar xzvf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/icons
 
 #remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.10.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}
 
+# conflict with gnome-themes-standard
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast/index.theme
+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/HighContrastInverse/index.theme
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,6 +86,12 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/*
 
 %changelog
+* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: gtk3-engines instead of gtk2-engines
+- update Source10 (metatheme-vine-7.tar.bz2)
+
 * Wed Jun 08 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.1-5
 - update icon theme
   - add more icons, fix broken icons

+ 114 - 0
g/gnome-tweak-tool/gnome-tweak-tool-vl.spec

@@ -0,0 +1,114 @@
+Name:           gnome-tweak-tool
+Version:        3.0.5
+Release:        1%{?_dist_release}
+Summary:        A tool to customize advanced GNOME 3 options
+
+License:        GPLv3
+URL:            http://live.gnome.org/GnomeTweakTool
+Source0:        http://ftp.gnome.org/pub/gnome/sources/gnome-tweak-tool/3.0/gnome-tweak-tool-%{version}.tar.xz
+
+Patch101:	gnome-tweak-tool-vine-customize.patch
+
+BuildArch:      noarch
+BuildRequires:  GConf2
+BuildRequires:  intltool
+BuildRequires:  gsettings-desktop-schemas
+BuildRequires:  pygobject-devel
+BuildRequires:  desktop-file-utils
+Requires:       gnome-shell
+Requires:       nautilus
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+%description
+GNOME Tweak Tool is an application for changing the advanced settings
+of GNOME 3.
+
+Features:
+* Install and switch gnome-shell themes
+* Switch gtk/icon/cursor themes
+* Switch window manager themes
+* Change:
+        * The user-interface and titlebar fonts
+        * Icons in menus and buttons
+        * Behavior on laptop lid close
+        * Shell font size
+        * File manager desktop icons
+        * Titlebar click action
+        * Shell clock to show date
+        * Font hinting and antialiasing 
+
+%prep
+%setup -q
+%patch101 -p1 -b .vine
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
+
+
+%files -f %{name}.lang
+%doc AUTHORS COPYING NEWS README
+%{_bindir}/%{name}
+%{python_sitelib}/gtweak
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}
+
+
+%changelog
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.5-1
+- initial build for Vine Linux
+
+
+* Tue Jul 19 2011 Michel Salim <salimma@fedoraproject.org> - 3.0.5-2
+- Depend on nautilus (# 722541)
+
+* Thu Jun 30 2011 Michel Salim <salimma@fedoraproject.org> - 3.0.5-1
+- Update to 3.0.5
+- upstream news:
+  http://ftp.gnome.org/pub/GNOME/sources/gnome-tweak-tool/3.0/gnome-tweak-tool-3.0.5.news
+  * autostart fixes
+  * appearance improvements
+  * focus follow mouse mode
+  * finer-grained desktop item visibility
+  * streamlined shell restart offer when enabling extensions
+
+* Mon Jun 13 2011 Rahul Sundaram <sundaram@fedoraproject.org> - 3.0.4-1
+- Update to 3.0.4
+- Dropped redundant commented out lines in spec
+- Updated description
+- Dropped defattr since it is set by default in recent RPM
+- http://ftp.gnome.org/pub/GNOME/sources/gnome-tweak-tool/3.0/gnome-tweak-tool-3.0.4.news
+  * Enables support for system wide themes
+  * Supports management of shell extensions 
+
+* Wed May  4 2011 Michel Salim <salimma@fedoraproject.org> - 3.0.3-1
+- Update to 3.0.3
+
+* Mon Apr  4 2011 Michel Salim <salimma@fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0
+
+* Fri Mar 25 2011 Michel Salim <salimma@fedoraproject.org> - 2.91.93-2
+- Enable icon theme selection
+
+* Fri Mar 25 2011 Michel Salim <salimma@fedoraproject.org> - 2.91.93-1
+- Update to 2.91.93
+
+* Tue Mar 22 2011 Michel Salim <salimma@fedoraproject.org> - 2.91.92-3
+- Include license information
+
+* Tue Mar 22 2011 Michel Salim <salimma@fedoraproject.org> - 2.91.92-2
+- Use %%configure macro
+- Validate desktop file
+
+* Mon Mar 21 2011 Michel Salim <salimma@fedoraproject.org> - 2.91.92-1
+- Initial package

+ 14 - 14
g/gnome-user-docs/gnome-user-docs-vl.spec

@@ -1,11 +1,10 @@
 Summary:        GNOME User Documentation
 Summary(ja):    GNOME ユーザドキュメント
 Name:           gnome-user-docs
-Version:        2.32.0
-Release:        3%{?_dist_release}
+Version:        3.0.4
+Release:        1%{?_dist_release}
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
-Source1:	gnome2-user-guide.ja.po
 Group:          Applications/Documentation
 
 BuildArch:      noarch
@@ -17,6 +16,9 @@ BuildRequires:  which
 Obsoletes:      gnome-users-guide
 Requires(post,postun): scrollkeeper >= 0.3.10
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 This package contains end user documentation for the GNOME desktop 
 environment.
@@ -41,7 +43,6 @@ desktop environment. (except for English and Japanese)
 
 %prep
 %setup -q
-cp %{SOURCE1} gnome2-user-guide/ja/ja.po
 
 %build
 %configure --disable-scrollkeeper
@@ -73,22 +74,21 @@ exit 0
 
 %files
 %defattr(-, root, root)
-%{_datadir}/gnome/help/*/C
-%{_datadir}/gnome/help/*/ja
-%{_datadir}/omf/*/*-C.omf
-%{_datadir}/omf/*/*-ja.omf
+%{_datadir}/gnome/help/gnome-help/C
+#%{_datadir}/gnome/help/gnome-help/ja
 
 %files l10n
 %defattr(-, root, root)
-%{_datadir}/gnome
-%{_datadir}/omf
-%exclude %{_datadir}/gnome/help/*/C
-%exclude %{_datadir}/gnome/help/*/ja
-%exclude %{_datadir}/omf/*/*-C.omf
-%exclude %{_datadir}/omf/*/*-ja.omf
+%{_datadir}/gnome/help/gnome-help/*
+%exclude %{_datadir}/gnome/help/gnome-help/C
+#%exclude %{_datadir}/gnome/help/gnome-help/ja
 
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.4-1
+- new upstream release
+- delete SOURCE1
+
 * Sat Nov 06 2010 Yasumichi Akahoshi <yasumichi@vinelinux.org> 2.32.0-3
 - update translation of gnome2-user-guide.
 

+ 19 - 8
g/gnome-user-share/gnome-user-share-vl.spec

@@ -1,31 +1,35 @@
 Summary: Gnome user file sharing
 Summary(ja): Gnome ユーザファイル共有
 Name: gnome-user-share
-Version: 2.30.1
+Version: 3.0.0
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/2.30/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/3.0/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: gnome-bluetooth-libs >= 2.28.0
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
-BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: httpd >= 2.2.0
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 BuildRequires: libnotify-devel
-BuildRequires: libcanberra-devel
+BuildRequires: libcanberra-gtk3-devel
 BuildRequires: gnome-bluetooth-devel >= 2.32.0
-BuildRequires: unique-devel
+BuildRequires: unique3-devel
 BuildRequires: nautilus-devel
+BuildRequires: libSM-devel
 BuildRequires: gnome-doc-utils
 Requires(post,pre,preun): GConf2
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 gnome-user-share is a small package that binds together various free
 software projects to bring easy to use user-level file sharing to the
@@ -45,7 +49,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %__make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
@@ -78,9 +82,9 @@ fi
 %doc README ChangeLog
 %{_bindir}/*
 %{_libexecdir}/*
-%{_libdir}/nautilus/extensions-2.0/*.so
-%{_datadir}/gnome-user-share
+%{_libdir}/nautilus/extensions-3.0/*.so
 %{_datadir}/applications/*
+%{_datadir}/gnome-user-share
 %{_datadir}/gnome/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/omf/*
@@ -88,6 +92,13 @@ fi
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 
 %changelog
+* Tue Aug 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- new upstream release
+- change BuildRequires: gtk3-devel instead of gtk2-devel
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- change BuildRequires: unique3-devel instead of unique-devel
+- add BuildRequires: libSM-devel
+
 * Tue Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.1-1
 - new upstream release
 

+ 26 - 80
g/gnome-utils/gnome-utils-vl.spec

@@ -11,15 +11,14 @@
 Summary: GNOME utility programs.
 Summary(ja): GNOME ユーティリティプログラム
 Name: gnome-utils
-Version: 2.32.0
-Release: 5%{?_dist_release}
+Version: 3.1.2
+Release: 1%{?_dist_release}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org
 
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.xz
 Source1: gnome-utils.2-32.ja.po
-Patch1: gnome-utils-2.14.0-gfloppy.patch
 Patch2: gnome-utils-2.26.0-gdate.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,13 +27,13 @@ BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libgtop2-devel >= %{gtop2_version}
-BuildRequires:  libcanberra-devel >= %{canberra_version}
+BuildRequires:  libcanberra-gtk3-devel >= %{canberra_version}
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  GConf2-devel >= 2.14
 BuildRequires:  libbonoboui-devel
 BuildRequires:	gnome-doc-utils
-BuildRequires:	libICE-devel
 BuildRequires:	libSM-devel
+BuildRequires:	gsettings-desktop-schemas
 Obsoletes: gnome
 Obsoletes: baobab
 Provides: baobab
@@ -93,7 +92,7 @@ This package contains GNOME screenshot utility.
 %prep
 %setup -q
 cp %{SOURCE1} po/ja.po
-%patch2 -p1
+#%patch2 -p1
 
 # Hide from menus
 pushd gsearchtool
@@ -186,74 +185,11 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 scrollkeeper-update -q
 update-desktop-database -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-dictionary.schemas gfloppy.schemas gnome-search-tool.schemas \
-	 baobab.schemas gnome-system-log.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/gconf/schemas/$S
-done | xargs gconftool-2 --makefile-install-rule  >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%post -n gnome-screenshot
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-screenshot.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/gconf/schemas/$S
-done | xargs gconftool-2 --makefile-install-rule  >& /dev/null ||:
-
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="gnome-dictionary.schemas gfloppy.schemas \ 
-             gnome-search-tool.schemas gnome-screenshot.schemas \
-	     logview.schemas baobab.schemas gnome-system-log.schemas"
-    for S in $SCHEMAS; do
-        if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
-	        echo %{_sysconfdir}/gconf/schemas/$S
-	fi
-    done | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-
-fi
-
-%pre -n gnome-screenshot
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="gnome-screenshot.schemas"
-    for S in $SCHEMAS; do
-        if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
-	        echo %{_sysconfdir}/gconf/schemas/$S
-	fi
-    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="gnome-dictionary.schemas gfloppy.schemas \ 
-             gnome-search-tool.schemas gnome-screenshot.schemas \
-	     logview.schemas baobab.schemas gnome-system-log.schemas"
-    for S in $SCHEMAS; do
-        if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
-	        echo %{_sysconfdir}/gconf/schemas/$S
-	fi
-    done | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun -n gnome-screenshot
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="gnome-screenshot.schemas"
-    for S in $SCHEMAS; do
-        if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
-	        echo %{_sysconfdir}/gconf/schemas/$S
-	fi
-    done | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -262,6 +198,10 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{po_package}.lang
@@ -271,20 +211,20 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_sbindir}/*
-%{_mandir}/man*/*
+%{_libdir}/lib*.so.*
+%{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/applications/*
-%{_datadir}/gnome-utils/
-%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome-dictionary/
 %{_datadir}/baobab/
+%{_datadir}/gnome-dictionary/
+%{_datadir}/gnome-utils/
+%{_datadir}/icons/hicolor/*
 %{_datadir}/gdict-1.0/
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*
-%{_libexecdir}/*
-%{_libdir}/bonobo/servers/*
-%{_libdir}/lib*.so.*
+%{_datadir}/thumbnailers/gnome-font-viewer.thumbnailer
+%{_mandir}/man*/*
 
-%exclude %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
+%exclude %{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
 %exclude %{_bindir}/gnome*screenshot
 %exclude %{_datadir}/applications/gnome-screenshot.desktop
 %exclude %{_datadir}/locale/ja/LC_MESSAGES/*
@@ -299,14 +239,20 @@ fi
 %files -n gnome-screenshot
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_bindir}/gnome*screenshot
 %{_datadir}/applications/gnome-screenshot.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
 %{_datadir}/gnome-screenshot/
 %{_datadir}/locale/ja/LC_MESSAGES/*
 
 
 %changelog
+* Mon Aug 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- new upstream release
+- add BuildRequires: gsettings-desktop-schemas
+- change BuildRequires: libcanberra-gtk3-devel instead of libcanberra-devel
+- drop Patch2
+
 * Fri Dec 10 2010 Yoji TOTYODA <bsyamato@sea.plala.or.jp> 2.32.0-5
 - create -devel sub package
 

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