rebuilt bonobo, gnome-print, gtk+

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

b/bonobo/bonobo-vl.spec

@@ -1,7 +1,7 @@
 # Note this is NOT a relocatable thing :)
 %define name	bonobo
 %define ver	1.0.22
-%define rel	7%{?_dist_release}
+%define rel	8%{?_dist_release}
 
 Summary:        CORBA-based component system
 Summary(ja):    CORBAベースのコンポーネントシステム
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/bonobo/*/*.a
 %{_includedir}/*
 
 %changelog
+* Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 1.0.22-8
+- rebuilt with gnome-print-0.37-3
+
 * Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 1.0.22-7
 - rebuilt with rpm-4.8.1 for pkg-config
 

g/gnome-print/gnome-print-vl.spec

@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define ver	0.37
-%define rel	2%{?_dist_release}
+%define rel	3%{?_dist_release}
 %define name	gnome-print
 %define sover	15
 
@@ -20,7 +20,8 @@ BuildRequires:	freetype2-devel
 BuildRequires:	automake14, autoconf213
 Requires:	libgnomeprint%{sover} = %{version}
 Requires:       urw-fonts ghostscript-fonts
-Prereq:		libxml urw-fonts ghostscript-fonts
+#Prereq:		libxml urw-fonts ghostscript-fonts
+Requires:		libxml urw-fonts ghostscript-fonts
 
 Obsoletes: 	gnome-print-beta < 0.26, gnome-print-bin < 0.26, gnome-print-beta-bin < 0.26, gnome-print-data < 0.26
 
@@ -32,6 +33,9 @@ Patch50:	gnome-print-0.34-fallback.patch
 Patch51:	gnome-print-0.35-dynamicfallback.patch
 Patch52:        gnome-print-0.37-ft2build.patch
 
+Patch60: gnome-print-0.37-config.patch
+Patch61: gnome-print-0.37-parseTT.patch
+
 %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
@@ -84,7 +88,6 @@ develop GNOME applications that will use the GNOME printing facilities.
 You don't need to install the gnome-print-devel package if you just want 
 to use the GNOME desktop enviornment.
 
-#'
 %prep
 %setup -q
 %patch2 -p1 -b .nofontmaps
@@ -92,6 +95,9 @@ to use the GNOME desktop enviornment.
 %patch51 -p1 -b .dynamic
 %patch52 -p1 -b .ft2build
 
+%patch60 -p0 -b .config
+%patch61 -p0 -b .parseTT
+
 %build
 libtoolize --copy --force
 autoheader-2.13
@@ -157,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/*
 
 %changelog
+* Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 0.37-3
+- added Patch60: gnome-print-0.37-config.patch
+- added Patch61: gnome-print-0.37-parseTT.patch
+
 * Sat May  2 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.37-2
 - rebuilt with gnome-libs-1.4.2-2vl5 (linking with db-4.6.21)
 - removed *.a

g/gtk+/gtk+-vl.spec

@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define	ver	1.2.10
-%define rel	3%{?_dist_release}
+%define rel	4%{?_dist_release}
 %define debug	off
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
@@ -267,7 +267,8 @@ fi
 
 # rename gtk-config to gtk-config-32 if build_compat32 option is enabled
 %if %{build_compat32}
-mv $RPM_BUILD_ROOT%{_bindir}/gtk-config $RPM_BUILD_ROOT%{_bindir}/gtk-config-32
+#mv $RPM_BUILD_ROOT%{_bindir}/gtk-config $RPM_BUILD_ROOT%{_bindir}/gtk-config-32
+cp -p $RPM_BUILD_ROOT%{_bindir}/gtk-config $RPM_BUILD_ROOT%{_bindir}/gtk-config-32
 %endif
 
 #
@@ -341,7 +342,8 @@ fi
 %{_includedir}/*
 %{_infodir}/*info*
 %{_datadir}/aclocal/*
-%{_bindir}/*
+#%{_bindir}/*
+%{_bindir}/gtk-config
 %doc tmpdocs/tutorial
 %doc tmpdocs/examples
 
@@ -360,11 +362,14 @@ fi
 %{_libdir}/lib*.so
 %{_libdir}/*.a
 %{_libdir}/pkgconfig 
-%{_bindir}/*
+%{_bindir}/gtk-config-32
 %endif
 
 
 %changelog
+* Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 1.2.10-4
+- fixed missing of gtk-config (on i686)
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.10-3
 - rebuild with rpm-4.8.1 for pkg-config file
 - add BuildRequires: libXt-devel