new upstream release and new package: gtk3

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

c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.4.2
+%define         clutter_version 1.6.4
 %define         clutter_release 1%{?_dist_release}
 
 Name:           clutter
@@ -25,10 +25,13 @@ Requires:       gobject-introspection
 
 BuildRequires:  glib2-devel
 BuildRequires:	mesa-libGL-devel
-BuildRequires:	gtk2-devel
+BuildRequires:	gdk-pixbuf2-devel
+BuildRequires:	atk-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pango-devel
 BuildRequires:  libXdamage-devel
+BuildRequires:  libXcomposite-devel
+BuildRequires:  libXi-devel
 BuildRequires:	gettext
 BuildRequires:	gtk-doc
 BuildRequires:  gobject-introspection-devel >= 0.9.5
@@ -50,7 +53,7 @@ Summary:        Clutter development environment
 Summary(ja):    Clutterの開発環境
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig glib2-devel pango-devel fontconfig-devel gtk2-devel
+Requires:       pkgconfig glib2-devel pango-devel fontconfig-devel gdk-pixbuf2-devel
 Requires:       mesa-libGL-devel
 Requires:       gobject-introspection-devel
 Requires:	json-glib-devel
@@ -77,7 +80,7 @@ This package contains documentation for clutter.
 
 %prep
 %setup -q
-%patch0 -p0 -b .atlas-textures
+#%patch0 -p0 -b .atlas-textures
 #%patch1 -p1 -b .glXDestroyPixmap
 
 
@@ -138,6 +141,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.4-1
+- new upstream release
+- change BuildRequires: gdk-pixbuf2-devel instead of gtk2-devel
+- add BuildRequires: atk-devel, libXcomposite-devel, libXi-devel
+- drop Patch0
+
 * Thu Dec 30 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.2-1
 - new upstream release
 - drop Patch1

g/glib2/glib2-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 Summary: A library of handy utility functions.
 Name: glib2
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Feb 19 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.1-1
+- new upstream release
+
 * Sat Feb 12 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.28.0-1
 - new upstream release
 

g/gtk3/gtk3-vl.spec

@@ -0,0 +1,312 @@
+# Note that this is NOT a relocatable package
+
+%define glib2_base_version 2.28.0
+%define glib2_version %{glib2_base_version}-1
+%define pango_base_version 1.28.3
+%define pango_version %{pango_base_version}-1
+%define atk_base_version 1.32.0
+%define atk_version %{atk_base_version}-1
+%define cairo_base_version 1.10.0
+%define cairo_version %{cairo_base_version}-1
+%define gdkpixbuf2_base_version 2.22.0
+%define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
+%define gobject_introspection_version 0.10.0
+
+
+%define base_version 3.0.0
+%define bin_version 3.0.0
+
+# biarch support
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+%define _query_suffix %{nil}
+%if %{build_compat32}
+%define _query_suffix -32
+%endif
+
+Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
+Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
+Name: gtk3
+Version: %{base_version}
+Release: 1%{?_dist_release}
+License: LGPL
+Group: System Environment/Libraries
+
+Source: gtk+-%{version}.tar.bz2
+
+Patch100: gtk+-2.99.3-vine-default-theme.patch
+
+BuildRequires: atk-devel >= %{atk_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: gdk-pixbuf2-devel >= %{gdkpixbuf2_version}
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires: libtiff-devel >= 3.7
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libpng-devel
+BuildRequires: jasper-devel
+BuildRequires: gtk-doc
+#BuildRequires: automake17, autoconf
+BuildRequires: gamin-devel
+BuildRequires: cups-devel
+BuildRequires: libICE-devel
+BuildRequires: libXext-devel
+BuildRequires: libXi-devel
+BuildRequires: libXrandr-devel >= 1.3.0
+BuildRequires: libXrender-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXdamage-devel
+
+BuildRoot: %{_tmppath}/gtk-%{version}-root
+
+URL: http://www.gtk.org
+
+# required for icon themes apis to work
+Requires: hicolor-icon-theme
+
+# We need to prereq these so we can run gtk-query-immodules-2.0
+Requires(post): glib2 >= %{glib2_version}
+Requires(post): atk >= %{atk_version}
+Requires(post): pango >= %{pango_version}
+Requires(post): libSM >= 1.1.0
+# We need to prereq libtiff >= 3.7 to run gdk-pixbuf-query-loaders
+Requires(post): libtiff >= 3.7
+Requires: libXrandr >= 1.3.0
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: Takemikaduchi
+
+
+%description
+GTK+ is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK+ is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+%package devel
+Summary: Development tools for GTK+ applications.
+Summary(ja): GTK+ (GIMP ツールキット) アプリケーション開発ツール
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pango-devel >= %{pango_version}
+Requires: atk-devel >= %{atk_version}
+Requires: glib2-devel >= %{glib2_version}
+Requires: gdk-pixbuf2-devel >= %{gdkpixbuf2_version}
+Requires: libX11-devel, libXcursor-devel, libXinerama-devel
+Requires: libXext-devel, libXi-devel, libXrandr-devel
+Requires: libXfixes-devel, libXcomposite-devel
+Requires: libpng-devel
+
+%description devel
+The gtk+-devel package contains the header files and developer
+docs for the GTK+ widget toolkit.  
+
+#######################################################################
+# compat32
+%package -n compat32-%{name}
+Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
+Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
+Group: System Environment/Libraries
+Requires(post): compat32-glib2 >= %{glib2_version}
+Requires(post): compat32-atk >= %{atk_version}
+Requires(post): compat32-pango >= %{pango_version}
+Requires(post): compat32-libSM >= 1.1.0
+Requires(post): compat32-libtiff >= 3.7
+Requires: compat32-libXrandr >= 1.3.0
+
+%description -n compat32-%{name}
+GTK+ is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK+ is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+%package -n compat32-%{name}-devel
+Summary: Development tools for GTK+ applications.
+Summary(ja): GTK+ (GIMP ツールキット) アプリケーション開発ツール
+Group: Development/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}
+Requires: compat32-libX11-devel, compat32-libXcursor-devel, compat32-libXinerama-devel
+Requires: compat32-libXext-devel, compat32-libXi-devel, compat32-libXrandr-devel
+Requires: compat32-libXfixes-devel, compat32-libXcomposite-devel
+Requires: compat32-libpng-devel
+
+%description -n compat32-%{name}-devel
+The gtk+-devel package contains the header files and developer
+docs for the GTK+ widget toolkit.  
+
+
+%prep
+%setup -q -n gtk+-%{version}
+%patch100 -p1 -b .vine-default-theme
+
+#for i in config.guess config.sub ; do
+#	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
+#done
+
+%build
+
+# if ! pkg-config --exists pangoxft ; then
+#         echo "No pangoxft.pc!"
+#         exit 1
+# fi
+
+#libtoolize --force --copy
+#autoreconf -i
+
+%configure --enable-gtk-doc \
+	--enable-man \
+	--enable-debug=minimum \
+	--disable-rebuilds \
+	--disable-glibtest \
+	--enable-introspection=yes \
+	--enable-xrandr \
+	--enable-xfixes \
+	--enable-xcomposite \
+	--enable-xdamage \
+	--enable-x11-backend 
+
+make ARCH=%{_arch}
+#make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false
+
+%find_lang gtk30
+%find_lang gtk30-properties
+
+cat gtk30.lang gtk30-properties.lang > all.lang
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
+#
+# Make cleaned-up versions of examples and tutorial for installation
+#
+mkdir -p tmpdocs/tutorial
+# install -m 0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
+for dir in examples/* ; do
+    if [ -d $dir ] ; then
+       mkdir -p tmpdocs/$dir
+       for file in $dir/* ; do
+          case $file in
+	     *pre1.2.7)
+	        ;;
+	     *)
+                install -m 0644 $file tmpdocs/$dir
+		;;
+	  esac
+       done
+    fi
+done
+
+
+# We need to have separate 32-bit and 64-bit binaries
+# for places where we have two copies of the GTK+ package installed.
+# (we might have x86_64 and i686 packages on the same system, for example.)
+%if %{build_compat32}
+   cp $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 \
+      $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0%{_query_suffix}
+%endif
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
+
+# Remove unpackaged files
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Raleigh
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/lib*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+%{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
+
+%postun 
+/sbin/ldconfig
+if [ $1 -gt 0 ]; then
+  %{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
+fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+%if %{build_compat32}
+%post -n compat32-%{name}
+/sbin/ldconfig
+%{_bindir}/gtk-query-immodules-3.0%{_query_suffix} --update-cache || : > /dev/null 2>&1
+
+%postun -n compat32-%{name}
+/sbin/ldconfig
+if [ $1 = 0 ]; then
+  %{_bindir}/gtk-query-immodules-3.0%{_query_suffix} --update-cache || : > /dev/null 2>&1
+fi
+%endif
+
+%files -f all.lang
+%defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/gtk3-demo
+%{_bindir}/gtk-query-immodules-3.0
+%exclude %{_bindir}/gtk-update-icon-cache
+%{_libdir}/libgtk-3.so.*
+%{_libdir}/libgdk-3.so.*
+%{_libdir}/libgailutil-3.so.*
+%dir %{_libdir}/gtk-3.0
+%{_libdir}/gtk-3.0/%{bin_version}
+%dir %{_libdir}/gtk-3.0/modules
+%{_libdir}/gtk-3.0/modules/lib*.so
+%{_libdir}/girepository-1.0/*.typelib
+%{_datadir}/gtk-3.0
+%{_datadir}/themes/Default
+%{_datadir}/themes/Emacs
+%dir %{_sysconfdir}/gtk-3.0
+%{_sysconfdir}/gtk-3.0/im-multipress.conf
+%{_datadir}/glib-2.0/schemas/*.xml
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%dir %{_libdir}/gtk-3.0
+%{_datadir}/gtk-doc/
+%{_datadir}/gir-1.0/*.gir
+%{_mandir}/man1/*
+%exclude %{_mandir}/man1/gtk-update-icon-cache.1.gz
+%{_includedir}/*
+%{_datadir}/aclocal/*
+%{_libdir}/pkgconfig/*
+%doc tmpdocs/tutorial
+
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-, root, root)
+%{_bindir}/gtk-query-immodules-3.0%{_query_suffix}
+%{_libdir}/libgtk-3.so.*
+%{_libdir}/libgdk-3.so.*
+%{_libdir}/libgailutil-3.so.*
+%dir %{_libdir}/gtk-3.0
+%{_libdir}/gtk-3.0/%{bin_version}
+%dir %{_libdir}/gtk-3.0/modules
+%{_libdir}/gtk-3.0/modules/lib*.so
+%dir %{_sysconfdir}/gtk-3.0
+
+%files -n compat32-%{name}-devel
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%dir %{_libdir}/gtk-3.0
+%{_libdir}/pkgconfig/*
+%endif
+
+%changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
+- initial build for Vine Linux
+

h/hitori/hitori-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 0.2.5
+%define pkg_version 0.2.6
 %define pkg_release 1%{?_dist_release}
 
 Summary: A logic game similar to Sudoku
@@ -57,6 +57,9 @@ Hitori は数独のようなより人気のあるパズルとテーマにおい
 
 
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.6-1
+- new upstream release
+
 * Thu Dec 09 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.5-1
 - new upstream release
 

i/ibus/ibus-vl.spec

@@ -1,5 +1,5 @@
 %define	ver 1.3.9
-%define	rel 1
+%define	rel 2
 
 Summary: Intelligent Input Bus for Linux / Unix OS
 Name: ibus
@@ -11,6 +11,9 @@ URL: http://code.google.com/p/ibus/
 Source0: %{name}-%{version}.tar.gz
 Patch0: ibus-1.2.0.20091024-fixPOFILES.in.patch
 Requires: gtk2, pyxdg, iso-codes, dbus-python >= 0.83.0
+%if %{?_dist_release} != "vl5"
+Requires: gtk3
+%endif
 Requires: notify-python
 Requires: librsvg2
 Requires(pre): GConf2
@@ -22,6 +25,9 @@ BuildRequires(install,check): desktop-file-utils
 BuildRequires: gettext >= 0.16.1, gtk2-devel, intltool >= 0.40.0
 BuildRequires: dbus-devel, dbus-python-devel >= 0.83.0
 BuildRequires: glib2-devel >= 2.0.0
+%if %{?_dist_release} != "vl5"
+BuildRequires: gtk3-devel >= 3.0.0
+%endif
 BuildRequires: GConf2-devel >= 2.12
 BuildRequires: perl >= 5.8.1 perl-XML-Parser
 Buildrequires: python >= 2.5
@@ -48,10 +54,27 @@ Requires:   vala
 %description devel
 Header files for iBus.
 
+%if %{?_dist_release} != "vl5"
+%package gtk3
+Summary: Ibus im module for gtk3
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post):	glib2
+
+%description gtk3
+The ibus-gtk3 contains ibus im module for gtk3.
+
+%endif
+
 %prep
 %setup -q
 %patch0 -p1
-%configure --disable-static --with-gtk2-im-module-dir=%{_libdir}/gtk-2.0/immodules
+%configure \
+	--disable-static \
+%if %{?_dist_release} != "vl5"
+	--enable-gtk3 \
+%endif
+	--with-gtk2-im-module-dir=%{_libdir}/gtk-2.0/immodules
 
 %build
 make %{?_smp_mflags}
@@ -62,6 +85,9 @@ make DESTDIR=%{buildroot} install
 
 rm -rf %{buildroot}%{_libdir}/libibus.la
 rm -rf %{buildroot}%{_libdir}/gtk-2.0/immodules/im-ibus.la
+%if %{?_dist_release} != "vl5"
+rm -rf %{buildroot}%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.la
+%endif
 
 rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop
 
@@ -79,9 +105,10 @@ rm -rf %{buildroot}
 %post
 /sbin/ldconfig
 if [ -x %{_bindir}/update-desktop-database ] ; then
-%{_bindir}/update-desktop-database %{_datadir}/applications
+%{_bindir}/update-desktop-database %{_datadir}/applications -q
 fi
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
+%{_bindir}/gtk-query-immodules-3.0 --update-cache
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 # recreate icon cache
@@ -107,14 +134,23 @@ fi
 %postun
 /sbin/ldconfig
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
+%{_bindir}/gtk-query-immodules-3.0 --update-cache
 if [ -x %{_bindir}/update-desktop-database ] ; then
-%{_bindir}/update-desktop-database %{_datadir}/applications
+%{_bindir}/update-desktop-database %{_datadir}/applications -q
 fi
 # recreate icon cache
 touch --no-create %{_datadir}/icons/hicolor || :
 [ -x %{_bindir}/gtk-update-icon-cache ] && \
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+%if %{?_dist_release} != "vl5"
+%post gtk3
+%{_bindir}/gtk-query-immodules-3.0 --update-cache
+
+%postun gtk3
+%{_bindir}/gtk-query-immodules-3.0 --update-cache
+
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -122,6 +158,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/ibus*
 %{_libdir}/libibus.so.*
 %{_libdir}/gtk-2.0/immodules/im-ibus.so
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-ui-gtk
 %{_libexecdir}/ibus-x11
@@ -145,7 +182,16 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/gir-1.0/IBus-1.0.gir
 %endif
 
+%if %{?_dist_release} != "vl5"
+%files gtk3
+%defattr(-,root,root,-)
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
+%endif
+
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.9-2
+- create -gtk3 sub package (VineSeed only)
+
 * Wed Dec 15 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.9-1
 - new upstream release
 - add files in devel sub package for VineSeed

lib/libc/libcanberra/libcanberra-vl.spec

@@ -3,16 +3,20 @@
 Summary: Portable Sound Event Library
 Summary(ja): ポータブルサウンドイベントライブラリ
 Name: libcanberra
-Version: 0.25
+Version: 0.26
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
 Source1: libcanberra-gtk-module.sh
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 
+# patch from fedora
+Patch1: libcanberra-quit-add.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
@@ -22,6 +26,9 @@ BuildRequires: gstreamer-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
 (http://0pointer.de/public/sound-theme-spec.html).
@@ -30,13 +37,22 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 libcanberra は XDG サウンドテーマ仕様にしたがった小型かつ軽量な実装です。
 
 %package gtk2
-Summary: Gtk+ Bindings for libcanberra
+Summary: Gtk+ 2.x Bindings for libcanberra
-Summary(ja): libcanberra の gtk+ バインディング
+Summary(ja): libcanberra の gtk+ 2.x バインディング
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description gtk2
-Gtk+ bindings for libcanberra
+Gtk+ 2.x bindings for libcanberra
+
+%package gtk3
+Summary: Gtk+ 3.x Bindings for libcanberra
+Summary(ja): libcanberra の gtk+ 3.x バインディング
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gtk3
+Gtk+ 3.x bindings for libcanberra
 
 %package devel
 Summary: Development Files for libcanberra Client Development
@@ -47,6 +63,7 @@ Requires: %{name}-gtk2 = %{version}-%{release}
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
+Requires: gtk3-devel
 
 %description devel
 Development Files for libcanberra Client Development
@@ -74,6 +91,15 @@ Requires: compat32-%{name} = %{version}-%{release}
 %description -n compat32-%{name}-gtk2
 Gtk+ bindings for libcanberra
 
+%package -n compat32-%{name}-gtk3
+Summary: Gtk+ 3.x Bindings for libcanberra
+Summary(ja): libcanberra の gtk+ 3.x バインディング
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+
+%description -n compat32-%{name}-gtk3
+Gtk+ 3.x bindings for libcanberra
+
 %package -n compat32-%{name}-devel
 Summary: Development Files for libcanberra Client Development
 Summary(ja): libcanberra クライアントのための開発ファイル
@@ -89,6 +115,7 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
+%patch1 -p1 -b .quit
 
 %build
 %configure --disable-static --disable-rpath --enable-pulse \
@@ -99,27 +126,27 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
-install -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+#install -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post gtk2
+%post gtk3
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || :
 
-%postun gtk2 -p /sbin/ldconfig
+%postun gtk3 -p /sbin/ldconfig
 
-%pre gtk2
+%pre gtk3
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-install-rule \
                 %{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
 fi
 
-%preun gtk2
+%preun gtk3
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
@@ -148,13 +175,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk2
 %defattr(-,root,root)
-%{_sysconfdir}/gconf/schemas/libcanberra.schemas
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
-%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+
+%files gtk3
+%defattr(-,root,root)
+%{_libdir}/libcanberra-gtk3.so.*
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+%{_sysconfdir}/gconf/schemas/libcanberra.schemas
+%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -162,9 +195,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
 %{_libdir}/libcanberra-gtk.so
+%{_libdir}/libcanberra-gtk3.so
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+%{_datadir}/vala/vapi/libcanberra-gtk.vapi
+%{_datadir}/vala/vapi/libcanberra.vapi
 
 # compat32
 %if %{build_compat32}
@@ -183,15 +220,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
 
+%files -n compat32-%{name}-gtk3
+%defattr(-,root,root)
+%{_libdir}/libcanberra-gtk3.so.*
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so
+
 %files -n compat32-%{name}-devel
 %defattr(-,root,root)
 %{_libdir}/libcanberra-gtk.so
+%{_libdir}/libcanberra-gtk3.so
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
 %{_libdir}/pkgconfig/libcanberra.pc
 %endif
 
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.26-1
+- new upstream release
+- add BuildRequires: gtk3-devel
+- add -gtk3 sub package
+- add Patch1 (libcanberra-quit-add.patch)
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.25-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

m/moserial/moserial-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 2.30.0
+%define pkg_version 2.32.0
 %define pkg_release 1%{?_dist_release}
 
 Summary:	Gtk-based serial terminal
@@ -6,7 +6,7 @@ Summary(ja):	GTKベースのシリアルターミナル
 Name:		moserial
 Version:	%{pkg_version}
 Release:	%{pkg_release}
-Source0:	http://ftp.gnome.org/pub/gnome/sources/moserial/2.30/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/moserial/2.32/%{name}-%{version}.tar.bz2
 License:	GPLv3+
 Group:		Applications/Communications
 URL:		http://live.gnome.org/moserial
@@ -81,6 +81,9 @@ fi
 
 
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
+- new upstream release
+
 * Sun Apr 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
 - initial build for Vine Linux
 

s/sakura/sakura-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 2.3.8
+%define pkg_version 2.4.0
 %define pkg_release 1%{?_dist_release}
 
 Summary: A terminal emulator based on libvte.
@@ -63,6 +63,9 @@ Sakura は GTK+ 及び VTEベースの端末エミュレータです。依存性
 
 
 %changelog
+* Fri Feb 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.0-1
+- new upstream release
+
 * Sat Apr 24 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.8-1
 - new upstream release