clutter,gthumb,babl,gegl:new upstream release, others: rebuild

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

T/TrueType-baekmuk/TrueType-baekmuk-vl.spec

@@ -7,7 +7,7 @@ Summary: 	Baekmuk Korean TrueType Fonts
 Summary(ja):	Baekmuk 韓国語 TrueType フォント
 Name:           TrueType-baekmuk
 Version:        2.2
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:        BSD
 Group: 		User Interface/X
 BuildArch:      noarch
@@ -17,8 +17,8 @@ BuildRequires:	ghostscript >= %{gsver}
 Source0:        http://kldp.net/frs/download.php/1429/baekmuk-ttf-2.2.tar.gz
 Source5:	CIDFnmap.ko
 
-PreReq:         chkfontpath, freetype-utils
+Requires:         chkfontpath, freetype-utils
-PreReq:         XOrg-font-utils
+Requires:         XOrg-font-utils
 
 %description
 This package provides Baekmuk Korean TrueType fonts.
@@ -80,6 +80,9 @@ install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{gslibdir}/
 %{gslibdir}/CIDFnmap.ko
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2-2
+- rebuild with rpm-4.8.1
+
 * Sun Oct 05 2008 Shu KONNO <owa@bg.wakwak.com> 2.2-1vl5
 - applied new versioning policy, spec in utf-8
 

T/TrueType-bitstream-vera/TrueType-bitstream-vera-vl.spec

@@ -4,7 +4,7 @@
 
 Name:      TrueType-bitstream-vera
 Version:   1.10
-Release:   1%{?_dist_release}
+Release:   2%{?_dist_release}
 Summary:   Bitstream Vera Fonts
 Summary:   Bitstream Vera フォント
 Group:     User Interface/X
@@ -62,6 +62,9 @@ fi
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10-2
+- rebuild with rpm-4.8.1
+
 * Sun Oct 05 2008 Shu KONNO <owa@bg.wakwak.com> 1.10-1vl5
 - applied new versioning policy, spec in utf-8
 

T/TrueType-hanaminplus/TrueType-hanaminplus-vl.spec

@@ -1,5 +1,5 @@
 %define version 0.3
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 %define hanamin_date 20081115
 %define ttfjp_version 6.0
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_datadir}/ghostscript/conf.d/cidfmap.ja.*
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3-2
+- rebuild with rpm-4.8.1
+
 * Wed Apr 22 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3-1
 - use %%__font_install_{post,postun} macros
 

T/TrueTypeFonts_jp/TrueTypeFonts_jp-vl.spec

@@ -2,7 +2,7 @@
 Name: TrueTypeFonts_jp
 Group: User Interface/X
 Version: 5.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Packager: Takuya Kobayashi <ruby11@cocoa.ocn.ne.jp>
 
 Summary: Virtual package for %{name}
@@ -25,6 +25,9 @@ This package has no files and requires %{required_package} as %{name}.
 %files
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.0-2
+- rebuild with rpm-4.8.1
+
 * Sun Oct 05 2008 Shu KONNO <owa@bg.wakwak.com> 5.0-1vl5
 - applied new versioning policy, spec in utf-8
 

b/babl/babl-vl.spec

@@ -1,7 +1,7 @@
 Summary:	A dynamic, any to any, pixel format conversion library
 Name:		babl
-Version:	0.1.2
+Version:	0.1.4
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Apr 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.4-1
+- new upstream release
+
 * Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 0.1.2-2
 - rebuilt with rpm-4.8.1-3
 

c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.6.10
+%define         clutter_version 1.6.14
 %define         clutter_release 1%{?_dist_release}
 
 Name:           clutter
@@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.14-1
+- new upstream release
+
 * Wed Mar 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.10-1
 - new upstream release
 

c/cvsweb/cvsweb-vl.spec

@@ -3,7 +3,7 @@ Summary(ja):	WebインタフェースのCVSリポジトリエクスプローラ
 
 %define	name	cvsweb
 %define	version	1.112
-%define	release	2%{?_dist_release}
+%define	release	3%{?_dist_release}
 #%define	serial	1
 %define contentdir /home/httpd
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/httpd/cvsweb.conf
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.112-3
+- rebuild with rpm-4.8.1
+
 * Mon Jun 22 2009 Shu KONNO <owa@bg.wakwak.com> 1.112-2
 - spec in utf-8
 

e/emerald/emerald-vl.spec

@@ -2,13 +2,15 @@ Name:           emerald
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.8.2
+Version:        0.8.4
 Release:        1%{?_dist_release}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
 
+Patch0:		05_build_without_gtk_disable_deprecated.patch
+
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
 # no compiz-devel available
@@ -42,6 +44,7 @@ for emerald, the themeable window decorator for Compiz.
 
 %prep
 %setup -q
+%patch0 -p1
 # Death to rpaths...
 perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure
@@ -103,6 +106,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* 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)
+
 * Mon May 04 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.2-1
 - new upstream release
 

f/farsight/farsight-vl.spec

@@ -6,7 +6,7 @@ Summary(ja):	音声/ビデオ会議フレームワーク
 
 Name:		farsight
 Version:	0.1.28
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.28-2
+- rebuild with rpm-4.8.1
+
 * Fri Sep 26 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 	0.1.28-1
 - initial build for Vine Linux
 

g/galculator/galculator-vl.spec

@@ -2,7 +2,7 @@ Summary: GTK 2 based scientific calculator
 Summary(ja): GTK2 ベースの関数電卓
 Name: galculator
 Version: 1.3.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2
 Group: Applications/Accessories
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.4-2
+- rebuild with rpm-4.8.1
+
 * Sun Apr 26 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.4-1
 - new upstream release
 - updated BuildRequires

g/gegl/gegl-vl.spec

@@ -1,19 +1,24 @@
 Summary:	A graph based image processing framework
 Summary(ja):	グラフベースの画像処理フレームワーク
 Name:		gegl
-Version:	0.1.2
+Version:	0.1.6
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
 
-# backported git commit fc207f85521c3939600bd3e5a337c6ed2dfaa950
+# backported, stripped down git commit 36f1e514acd32152dfee7c09d0e5a4e022a5a543
-# "process: don't leak each node set on a GeglProcessor"
+# "Fix erroneous use of $(DESTDIR)."
-Patch0:     gegl-0.1.2-processor-leak.patch
+Patch0:     gegl-0.1.6-destdir.patch
-# avoid buffer overflow in gegl_buffer_header_init()
+# backported git commit 4439c947c25ead3073fc3cb00b03fbfc0914e81a
-Patch1:     gegl-0.1.2-buffer-save-overflow.patch
+# "Check if aux_rect is NULL before dereferencing"
+Patch1:     gegl-0.1.6-hstack.patch
+# rebuilt autofoo files due to the above
+Patch100:   gegl-0.1.6-autoreconf.patch
+
+Patch500:   gegl-0.1.6-ppc-check-vine.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	babl-devel gtk2-devel ruby
@@ -40,9 +45,16 @@ developing with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .destdir
+%patch1 -p1 -b .hstack
+
+%patch100 -p1 -b .autoreconf
+
+%ifarch ppc
+%patch500 -p1 -b .ppc_check
+%endif
+
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
-%patch0 -p1 -b .processor-leak
-%patch1 -p1 -b .buffer-save-overflow
 
 %build
 %ifnarch ppc64
@@ -77,14 +89,18 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-, root, root, -)
+%ifnarch ppc64
+%doc %{_datadir}/gtk-doc/html/%{name}
+%endif
 %{_includedir}/gegl-0.1/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifnarch ppc64
-%doc %{_datadir}/gtk-doc/html/gegl/
-%endif
 
 %changelog
+* Thu Apr 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-1
+- new upstream release
+- update patches
+
 * Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 0.1.2-2
 - rebuilt with rpm-4.8.1-3
 

g/gnome-schedule/gnome-schedule-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_version	2.0.2
-%define pkg_release	2%{?_dist_release}
+%define pkg_release	3%{?_dist_release}
 
 Summary:	A GTK+ based user interface for cron and at
 Summary(ja): 	cron と at 用の GUI 設定ツール
@@ -88,6 +88,9 @@ scrollkeeper-update > /dev/null 2>&1 || :
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.2-3
+- rebuild with rpm-4.8.1
+
 * Mon May 11 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 2.0.2-2
 - spec in utf-8 (only for VineSeed/Vine 5.0)
 

g/gnome-themes-extras/gnome-themes-extras-vl.spec

@@ -2,7 +2,7 @@ Summary: GNOME Extra Themes collection
 Summary(ja): GNOME 追加テーマコレクション
 Name: gnome-themes-extras
 Version: 2.22.0
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Source0: %{name}-%{version}.tar.bz2
 Source1: GTK2-LighthouseWhite.tar.gz
 Source2: GTK2-Smooth-Orangish.tar.gz
@@ -13,7 +13,8 @@ Group: User Interface/Desktops
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
-BuildRequires: gtk2-engines >= 2.2.0
+BuildRequires: gtk2-engines-devel >= 2.2.0
+BuildRequires: icon-naming-utils
 Requires: gtk2-engines >= 2.6.0-0vl1
 Conflicts: gtk2-engines < 2.2.0-0vl3
 Requires: metacity >= 2.4.34-0vl2
@@ -66,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.0-3
+- rebuild with rpm-4.8.1
+- change BuildRequires: gtk2-engines-devel instead of gtk2-engines
+- add BuildRequires: icon-naming-utils
+
 * Tue Jun  2 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.22.0-2
 - spec in UTF-8
 

g/gnome-vfs2-monikers/gnome-vfs2-monikers-vl.spec

@@ -7,7 +7,7 @@
 Summary: Monikers for the GNOME virtual file-system
 Name: gnome-vfs2-monikers
 Version: 2.15.3
-Release: 0vl1
+Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-%{version}.tar.bz2
@@ -59,6 +59,9 @@ rm -fr %{buildroot}
 %{_libdir}/bonobo
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.15.3-1
+- rebuild with rpm-4.8.1
+
 * Mon Apr 30 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 2.15.3-0vl1
 - initial build for Vine Linux
 

g/gphoto2/gphoto2-vl.spec

@@ -2,7 +2,7 @@ Summary: Software for accessing digital cameras
 Summary(ja): デジタルカメラにアクセスするためのソフトウェア
 Name: gphoto2
 Version: 2.4.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -10,7 +10,7 @@ Source: http://prdownloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 URL: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 
-PreReq: grep, fileutils
+Requires: grep, fileutils
 Provides: libgphoto2 = %{version}-%{release}
 BuildRequires: libgphoto2-devel
 BuildRequires: libusb-devel >= 0.1.11
@@ -19,6 +19,8 @@ BuildRequires: findutils perl popt
 
 BuildRequires: hal-devel, libtool-ltdl-devel
 BuildRequires: slang-devel
+BuildRequires: popt-devel
+BuildRequires: libjpeg-turbo-devel
 
 %description
 The gPhoto2 project is a universal, free application and library
@@ -61,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Fri Apr 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.5-2
+- rebuild with rpm-4.8.1
+- add BuildRequires: popt-devel, libjpeg-turbo-devel
+
 * Wed May 27 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.5-1
 - new upstream release
 - disable aalib support

g/gstreamer-plugins-farsight/gstreamer-plugins-farsight-vl.spec

@@ -3,7 +3,7 @@
 
 Name:           gstreamer-plugins-farsight
 Version:        0.12.11
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        GStreamer plug-ins for farsight protocol
 Summary(ja):    farsight プロトコル用 GStreamer プラグイン
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{gst_majorminor}/*.so
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.11-2
+- rebuild with rpm-4.8.1
+
 * Sat Apr 11 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.11-1
 - new upstream release
 - spec in UTF-8

g/gthumb/gthumb-vl.spec

@@ -11,7 +11,7 @@
 Summary: Image viewer, editor, organizer
 Summary(ja): 画像閲覧、編集、管理ツール
 Name: gthumb
-Version: 2.12.2
+Version: 2.12.3
 Release: 1%{?_dist_release}
 URL: http://gthumb.sourceforge.net/
 Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.12/%{name}-%{version}.tar.bz2
@@ -131,6 +131,9 @@ update-desktop-database -q ||:
 
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.ro.jp> 2.12.3-1
+- new upstream release
+
 * Wed Jan 26 2011 Yoji TOYODA <bsyamato@sea.plala.ro.jp> 2.12.2-1
 - new upstream release
 

i/icewm/icewm-vl.spec

@@ -2,7 +2,7 @@ Summary: Fast and small X11 window manager
 Summary(ja): 高速で軽量なウィンドウマネージャ
 Name: icewm
 Version: 1.2.37
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Source: http://ftp1.sourceforge.net/icewm/icewm-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}-1.2.32-ja.po
@@ -26,6 +26,7 @@ BuildRequires: imlib-devel libpng-devel freetype2-devel
 BuildRequires: gnome-desktop-devel startup-notification-devel
 BuildRequires: gnome-vfs2-devel libgnomeui-devel
 BuildRequires: xorg-x11-font-utils
+BuildRequires: libSM-devel
 
 # default apps
 # Prereq: mlterm firefox sylpheed
@@ -98,6 +99,10 @@ cp -pr IceCrack2 $RPM_BUILD_ROOT%{_datadir}/icewm/themes/IceCrack
 %{_bindir}/icewm-menu-gnome2
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.37-2
+- rebuild with rpm-4.8.1
+- add BuildRequires: libSM-devel
+
 * Mon Apr 27 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.37-1vl5
 - new upstream release
 - added Patch0

i/icon-naming-utils/icon-naming-utils-vl.spec

@@ -2,7 +2,7 @@ Summary: 	A script to handle icon names in desktop icon themes
 Summary(ja):    デスクトップアイコンテーマでアイコン名を扱うためのスクリプト
 Name:           icon-naming-utils
 Version:        0.8.7
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          Development/Tools
 License:        GPL 
 URL:            http://tango-project.org/Standard_Icon_Naming_Specification
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dtds/*.dtd
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.7-2
+- rebuild with rpm-4.8.1
+
 * Wed Sep 24 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.7-1
 - new upstream release
 

lib/libg/libgphoto2/libgphoto2-vl.spec

@@ -2,7 +2,7 @@ Summary: Library for accessing digital cameras
 Summary(ja): デジタルカメラにアクセスするためのライブラリ
 Name: libgphoto2
 Version: 2.4.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -150,7 +150,11 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
 
+
 %changelog
+* Thu Sep 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.5-2
+- rebuild with rpm-4.8.1 for pkg-config file
+
 * Wed Apr 15 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.5-1
 - new upstream release
 - build with libtool-2.2.6a

m/mew/mew-vl.spec

@@ -1,21 +1,19 @@
 %define _docdir %{_defaultdocdir}
 %define _noVersionedDependencies        1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+# %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+
+%define _libdir %{_prefix}/lib
 
 %define       origver       6.3
 %define       pkgver        %{origver}
 %define       origname      mew        
 
-%ifarch x86_64
-%define _lib lib
-%endif
-
 
 Summary:       Mew - Messaging in the Emacs World
 Summary(ja):   Emacs でメールを読むためのインターフェース
 Name:          %{origname}
 Version:       %{origver}
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 License:       distributable
 Group:         Applications/Editors/Emacs
 URL:           http://www.mew.org/
@@ -27,16 +25,16 @@ Source3:       vine.dot.mew
 Source4:       %{name}-init.el
 Source5:       vine-default-%{name}.el
 
-Patch11:       mew-2.1-icondir.diff
+Patch11:       mew-6.3-icondir.diff
 
-PreReq:        emacsen
+Requires:      emacsen
 Requires:      perl >= 5.004_jp-4
 Provides:      %{origname} = %{origver}
 #Conflicts:     %{origname}-el
 Obsoletes:     mew-mule, mew-el
 Obsoletes:     mew-xemacs, mew-xemacs-extra
 Requires:      mew-common = %{version}
-PreReq:        /sbin/install-info
+# PreReq:        /sbin/install-info
 
 BuildRequires: emacsen
 BuildRoot:     %{_tmppath}/%{name}-%{origver}-root
@@ -102,7 +100,7 @@ mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
 mkdir -p %{buildroot}%{_libdir}/emacsen-common/packages/install
 mkdir -p %{buildroot}%{_libdir}/emacsen-common/packages/remove
 mkdir -p %{buildroot}/usr/info
-mkdir -p %{buildroot}/usr/X11R6/include/X11/pixmaps
+mkdir -p %{buildroot}%{_datadir}/pixmaps/%{origname}
 # install el files
 
 
@@ -119,9 +117,9 @@ mkdir -p %{buildroot}/usr/X11R6/include/X11/pixmaps
         #         $RPM_BUILD_ROOT/%{_docdir}/%{origname}/contrib/
 
         ## install icons
-        cp etc/*.xpm %{buildroot}/usr/X11R6/include/X11/pixmaps
+        cp etc/*.xpm %{buildroot}/usr/share/pixmaps/%{origname}
-        cp etc/*.png %{buildroot}/usr/X11R6/include/X11/pixmaps
+        cp etc/*.png %{buildroot}/usr/share/pixmaps/%{origname}
-        cp etc/*.img %{buildroot}/usr/X11R6/include/X11/pixmaps
+        cp etc/*.img %{buildroot}/usr/share/pixmaps/%{origname}
 
         ## install contrib
         #cp -a contrib $(CURDIR)/debian/mew/usr/share/doc/mew
@@ -182,10 +180,10 @@ fi
 %defattr(-,root,root)
 %{_infodir}/mew.info*
 %{_infodir}/mew.jis.info*
-/usr/share/emacs/site-lisp/%{origname}/
+%{_datadir}/emacs/site-lisp/%{origname}/
-/usr/lib/emacsen-common/packages/install/%{origname}
+%{_libdir}/emacsen-common/packages/install/%{origname}
-/usr/lib/emacsen-common/packages/remove/%{origname}
+%{_libdir}/emacsen-common/packages/remove/%{origname}
-/usr/X11R6/include/X11/pixmaps
+%{_datadir}/pixmaps/%{origname}
 
 
 %files -n mew-common
@@ -197,6 +195,11 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.3-2
+- rebuild with rpm-4.8.1
+- change pixmap directory
+- fix Patch11
+
 * Mon Dec 21 2009 KOBAYASHI Taizo <tkoba@vinelinux.org> 6.3-1
 - new upstream release
 

x/xorg-x11-jpfonts/xorg-x11-jpfonts-vl.spec

@@ -7,7 +7,7 @@ Summary: Japanese fixed fonts for X11
 Summary(ja): X用日本語固定長フォント
 Name: xorg-x11-jpfonts
 Version: 4.0
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 License: Distributable but knj10(Non-Free)
 Group: User Interface/X
 Requires: xorg-x11-fonts-75dpi
@@ -396,6 +396,9 @@ rm -rf $RPM_BUILD_ROOT
 %{fontdir}/*
 
 %changelog 
+* Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.0-2
+- rebuild with rpm-4.8.1
+
 * Thu Jun 05 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 4.0-1
 - new versioning policy, spec in UTF-8