new upstream release

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

g/gnome-web-photo/gnome-web-photo-vl.spec

@@ -1,36 +1,34 @@
-%define build_vine5 0
-%define build_vine6 0
+%define build_vine7 0
 
-%if "%{?_dist_release}" == "vl5"
-%define build_vine5 1
-%endif
-%if "%{?_dist_release}" == "vl6"
-%define build_vine6 1
+%if "%{?_dist_release}" == "vl7"
+%define build_vine7 1
 %endif
 
 Summary:	HTML pages thumbnailer
 Summary(ja):	HTML ページのサムネール作成ツール
 Name:		gnome-web-photo
-Version:	0.9
-Release:	4%{?_dist_release}
+Version:	0.10.5
+Release:	1%{?_dist_release}
 License:	LGPLv2+
 Group:		Applications/Internet
 URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		gnome-web-photo-xulrunner192.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.xz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%if %{build_vine7}
+BuildRequires:	gtk3-devel >= 2.14.0
+BuildRequires:	WebKit3-gtk-devel >= 1.1.23
+%else
 Requires(post):	GConf2
 Requires(preun):GConf2
-Requires:	gecko-libs >= 1.9
-BuildRequires:	gtk2-devel >= 2.10.0
-BuildRequires:	libxml2-devel
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gecko-devel >= 1.9
-BuildRequires:	gecko-devel-unstable >= 1.9
-BuildRequires:	libjpeg-devel
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	GConf2-devel
+BuildRequires:	WebKit-gtk-devel >= 1.1.23
+%endif
 BuildRequires:	gettext intltool
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
 Packager:	kazutaka
 
 %description
@@ -41,26 +39,40 @@ screenshots of web pages.
 %prep
 %setup -q
 
-%if %{build_vine6}
-%patch0 -p1 -b .xulrunner192
-%endif
-
 %build
-%configure
+%if %{build_vine7}
+%configure --with-gtk=3.0
+%else
+%configure --with-gtk=2.0
+%endif
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+
+%if %{build_vine7}
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%else
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 %{__mv} $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/thumbnailer.schemas \
 	$RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
+%endif
 
 %find_lang %{name}
 
+
+%if %{build_vine7}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%else
+
 %post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas >& /dev/null
@@ -80,19 +92,32 @@ if [ "$1" -eq 0 ]; then
       %{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas >& /dev/null
 fi
 
+%postun -p /sbin/ldconfig
+
+%endif
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog AUTHORS README TODO COPYING.README
+%if !%{build_vine7}
 %{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
+%endif
 %{_bindir}/gnome-web-photo
 %{_bindir}/gnome-web-print
 %{_bindir}/gnome-web-thumbnail
 %{_datadir}/gnome-web-photo
+%if %{build_vine7}
+%{_datadir}/thumbnailers/gnome-web-photo.thumbnailer
+%endif
 
 %changelog
+* Sun Jan 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.5-1
+- new upstream release
+
 * Sat Apr 17 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 0.9-4
 - remove %%{gecko_version} macro and specify explicit minimum version 
 

g/gtk2/gtk2-vl.spec

@@ -12,7 +12,7 @@
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gobject_introspection_version 0.9.8
 
-%define base_version 2.24.8
+%define base_version 2.24.9
 %define bin_version 2.10.0
 
 # biarch support
@@ -325,6 +325,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 30 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.9-1
+- new upstream release
+
 * Wed Nov 16 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.8-1
 - new upstream release
 - update Patch100 (gtk+-2.24.8-vine-default-theme.patch)

lib/libx/libxcb/libxcb-vl.spec

@@ -5,7 +5,7 @@
 Summary:        A C binding to the X11 protocol
 Summary(ja):    X11 プロトコルの C による実装
 Name:           libxcb
-Version:        1.7
+Version:        1.8
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@ License:        MIT
 URL:            http://xcb.freedesktop.org/
 Source0:        http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 
-Source2:        http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
-
 Patch10:        libxcb-1.7-no-pthread-stubs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,6 +26,8 @@ BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
 BuildRequires:  python-devel
 
+Obsoletes:	%{name}-python < 1.8
+
 %description
 The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
 small footprint, latency hiding, direct access to the protocol, improved
@@ -50,14 +50,6 @@ Group:          Documentation
 %description    doc
 The %{name}-doc package contains documentation for the %{name} library.
 
-%package        python
-Summary:        Python bindings for %{name}
-Group:          Development/Libraries
-Provides:       xpyb
-
-%description    python
-Python bindings for %{name}.
-
 %package        -n compat32-%{name}
 Summary:        A C binding to the X11 protocol
 Summary(ja):    X11 プロトコルの C による実装
@@ -79,40 +71,22 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -b2
+%setup -q
 %patch10 -p1
 
-pushd ../xpyb-%{xpyb_version}
-# XXX fix me upstream please
-sed -i 's@$(pythondir)@$(pyexecdir)@' src/Makefile.am
-popd
-
 %build
 autoreconf -v --install
 %configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} --disable-selinux
 make %{?_smp_mflags}
 
-pushd ../xpyb-%{xpyb_version}
-autoreconf -v --install
-%configure
-make %{?_smp_mflags}
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 
-pushd ../xpyb-%{xpyb_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-# remove xml and txt file
-rm -rf $RPM_BUILD_ROOT%{_docdir}/xpyb
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -136,10 +110,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/doc/%{name}-%{version}
 
-%files python
-%defattr(-,root,root,-)
-%{python_sitearch}/xcb
-
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr(-,root,root,-)
@@ -152,6 +122,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Jan 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8-1
+- new upstream release
+- remove Source2
+- remove python sub package
+
 * Sun Nov 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7-1
 - new upstream release
 - update Patch10

t/thunderbird/thunderbird-vl.spec

@@ -1,5 +1,5 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 9.0.1
+%define tbmajor 10.0
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
@@ -347,6 +347,9 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Feb 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.0-1
+- new upstream release
+
 * Sat Dec 24 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.0.1-1
 - new upstream release
 - update Source1

x/xcb-proto/xcb-proto-vl.spec

@@ -2,8 +2,8 @@
 
 Summary:        XCB protocol descriptions
 Name:           xcb-proto
-Version:        1.6
-Release:        2%{?_dist_release}
+Version:        1.7
+Release:        1%{?_dist_release}
 
 Group:          Development/Libraries
 License:        MIT
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/xcbgen
 
 %changelog
+* Sun Jan 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7-1
+- new upstream release
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6-2
 - rebuild with rpm-4.8.1 for pkg-config file