slocate: fix BTS:1176

qt4: fix compat32-qt4-devel
others: create compat32 sub packages

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

c/cdparanoia/cdparanoia-vl.spec

@@ -1,8 +1,10 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Name: cdparanoia
 Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 Summary(ja): 音楽 CD (CDDA) 用の抽出ツール
 Version: 10.2
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 Group: Applications/Multimedia
 License: GPLv2 and LGPLv2
@@ -33,12 +35,41 @@ Summary: Development tools for libcdda_paranoia (Paranoia III).
 Summary(ja): libcdda_paranoia (Paranoia III) の開発用ファイル
 Group: Development/Libraries
 License: LGPLv2
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The cdparanoia-devel package contains the static libraries and header
 files needed for developing applications to read CD Digital Audio disks.
 
+# compat32
+%package -n compat32-%{name}
+Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
+Summary(ja): 音楽 CD (CDDA) 用の抽出ツール
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
+writes the data to a file or pipe in WAV, AIFC or raw 16 bit linear
+PCM format.  Cdparanoia doesn't contain any extra features (like the ones
+included in the cdda2wav sampling utility).  Instead, cdparanoia's strength
+lies in its ability to handle a variety of hardware, including inexpensive
+drives prone to misalignment, frame jitter and loss of streaming during
+atomic reads.  Cdparanoia is also good at reading and repairing data from
+damaged CDs.
+
+%package -n compat32-%{name}-devel
+Summary: Development tools for libcdda_paranoia (Paranoia III).
+Summary(ja): libcdda_paranoia (Paranoia III) の開発用ファイル
+Group: Development/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+
+%description -n compat32-%{name}-devel
+The cdparanoia-devel package contains the static libraries and header
+files needed for developing applications to read CD Digital Audio disks.
+
+
 %prep
 %setup -q -n %{name}-III-%{version}
 %patch1 -p3 -b .#463009
@@ -78,6 +109,10 @@ popd
 
 %postun -p /sbin/ldconfig
 
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT"
 
@@ -95,7 +130,21 @@ popd
 %{_libdir}/lib*.so
 %{_libdir}/*.a
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-, root, root)
+%{_libdir}/*.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-, root, root)
+%{_libdir}/*.so
+%endif
+
 %changelog
+* Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.2-3
+- create compat32 sub packages
+
 * Sun Apr 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 10.2-2
 - rebuilt with new toolchain
 - added Japanese summary

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

@@ -1,3 +1,5 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define major 0.10
 
 %define _gst_ver	0.10.35
@@ -17,7 +19,7 @@ Summary:	GStreamer Streaming-media framework base plugins
 Summary(ja):	GStreamer ストリーミングメディアフレームワーク用基本プラグイン
 Name:		gstreamer-plugins-base
 Version:	0.10.35
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://gstreamer.freedesktop.org/
@@ -88,6 +90,42 @@ plugins.
 This package contains GStreamer base plugins library depvelopment and header
 files.
 
+# compat32
+%package -n compat32-%{name}
+Summary:	GStreamer Streaming-media framework base plugins
+Summary(ja):	GStreamer ストリーミングメディアフレームワーク用基本プラグイン
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+GStreamer is a streaming-media framework, based on graphs of filters which
+operate on media data. Applications using this library can do anything
+from real-time sound processing to playing videos, and just about anything
+else media-related.  Its plugin-based architecture means that new data
+types or processing capabilities can be added simply by installing new
+plugins.
+
+This package contains a set of well-maintained base plugins.
+
+%package -n compat32-%{name}-devel
+Summary:	Libraries/include files for GStreamer base plugins
+Summary(ja):	GStreamer 基本プラグインの開発用ライブラリ
+Group:		Development/Libraries
+Requires:	compat32-%{name} = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	compat32-gstreamer-devel >= %{_gst_ver}
+
+%description -n compat32-%{name}-devel
+GStreamer is a streaming-media framework, based on graphs of filters which
+operate on media data. Applications using this library can do anything
+from real-time sound processing to playing videos, and just about anything
+else media-related.  Its plugin-based architecture means that new data
+types or processing capabilities can be added simply by installing new
+plugins.
+
+This package contains GStreamer base plugins library depvelopment and header
+files.
+
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
@@ -125,6 +163,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %postun -p /sbin/ldconfig
 
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %files -f %{po_package}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING* NEWS README RELEASE REQUIREMENTS
@@ -157,7 +199,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_libdir}/gstreamer-%{major}/libgsttcp.so
 %{_libdir}/gstreamer-%{major}/libgsttypefindfunctions.so
 #{_libdir}/gstreamer-%{major}/libgsturidecodebin.so
-%{_libdir}/gstreamer-%{major}/libgstvideo4linux.so
+#%{_libdir}/gstreamer-%{major}/libgstvideo4linux.so
 %{_libdir}/gstreamer-%{major}/libgstvideorate.so
 %{_libdir}/gstreamer-%{major}/libgstvideoscale.so
 %{_libdir}/gstreamer-%{major}/libgstvideotestsrc.so
@@ -183,7 +225,24 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libgst*-%{major}.so
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root)
+%{_libdir}/libgst*-%{major}.so.*
+%{_libdir}/gstreamer-%{major}/*.so
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root)
+%{_libdir}/libgst*-%{major}.so
+%{_libdir}/pkgconfig/*.pc
+%endif
+
+
 %changelog
+* Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.35-2
+- create compat32 sub packages
+
 * Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.35-1
 - new upstream release
 

lib/libt/libtheora/libtheora-vl.spec

@@ -1,8 +1,10 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Summary: Theora video compression codec
 Summary(ja): Theora 映像圧縮コーデック
 Name: libtheora
 Version: 1.1.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: BSD
 URL: http://www.theora.org/
 Source: http://www.theora.org/files/libtheora-%{version}.tar.bz2
@@ -23,13 +25,36 @@ general-purpose compressed video format.
 Summary: Headers for developing programs that will use libtheora
 Summary(ja): libtheora の開発用ファイル
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: libogg-devel >= 1.1
 
 %description devel
 This package contains the headers that programmers will need to develop
 applications which will use %{name}.
 
+# compat32
+%package -n compat32-%{name}
+Summary: Theora video compression codec
+Summary(ja): Theora 映像圧縮コーデック
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+Ogg Theora is a fully open, non-proprietary, patent-and-royalty-free,
+general-purpose compressed video format.
+
+%package -n compat32-%{name}-devel
+Summary: Headers for developing programs that will use libtheora
+Summary(ja): libtheora の開発用ファイル
+Group: Development/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: compat32-libogg-devel >= 1.1
+
+%description -n compat32-%{name}-devel
+This package contains the headers that programmers will need to develop
+applications which will use %{name}.
+
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -53,6 +78,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtheora*.la
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root, 0755)
 %doc README COPYING
@@ -66,8 +99,22 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtheora*.la
 %{_libdir}/libtheora*.so
 %{_libdir}/pkgconfig/*.pc
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-, root, root)
+%{_libdir}/*.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-, root, root)
+%{_libdir}/*.so
+%endif
+
 
 %changelog
+* Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.1-3
+- create compat32 sub packages
+
 * Tue Sep 21 2010 IWAI, Masaharu <iwai@alib.jp> 1.1.1-2
 - build with rpm-4.8.1-1 for pkg-config file
 

lib/libv/libvisual/libvisual-vl.spec

@@ -1,10 +1,12 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define lang_name %{name}-0.4
 
 Summary: a framework that delivers audio visualisation
 Summary(ja): オーディオの可視化を実現するためのフレームワーク
 Name: libvisual
 Version: 0.4.0
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2
 Group: System Environment/Libraries
@@ -31,6 +33,28 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 Development files for libvisual.
 
+# compat32
+%package -n compat32-%{name}
+Summary: a framework that delivers audio visualisation
+Summary(ja): オーディオの可視化を実現するためのフレームワーク
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+Libvisual is meant as a framework that delivers audio visualisation(read: eye candy generated to the current music you are playing)
+to multimedia applications. It works by acting as a middle layer between the visualisation plugin and application.
+
+%package -n compat32-%{name}-devel
+Summary: Development files for libvisual
+Group: Development/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n compat32-%{name}-devel
+Development files for libvisual.
+
+
 %prep
 %setup -q
 
@@ -50,6 +74,14 @@ Development files for libvisual.
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %files -f %{lang_name}.lang
 %defattr(-,root,root)
 %{_libdir}/libvisual-0.4.so.*
@@ -61,8 +93,23 @@ Development files for libvisual.
 #{_libdir}/libvisual-0.4.la
 %{_libdir}/pkgconfig/libvisual-0.4.pc
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root)
+%{_libdir}/libvisual-0.4.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root)
+%{_libdir}/libvisual-0.4.so
+%{_libdir}/pkgconfig/libvisual-0.4.pc
+%endif
+
 
 %changelog
+* Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.0-5
+- create compat32 sub packages
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.0-4
 - rebuild with rpm-4.8.1 for pkg-config file
 

q/qt4/qt4-vl.spec

@@ -8,7 +8,7 @@ Summary: Qt toolkit
 Summary(ja): Qt ツールキット
 Name: qt4
 Version: 4.8.0
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -1084,24 +1084,16 @@ fi
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
-%{_qt4_bindir}/*
-%exclude %{_qt4_bindir}/qdbus
-%exclude %{_qt4_bindir}/designer
-%exclude %{_qt4_bindir}/linguist
-%exclude %{_qt4_bindir}/lrelease
-%exclude %{_qt4_bindir}/lupdate
-#{_qt4_docdir}
-%{_qt4_headerdir}/*
 %{_qt4_libdir}/libQt*.so
 %{_qt4_libdir}/libQtUiTools.a
 %{_qt4_libdir}/libQt*.prl
-%{_qt4_datadir}/mkspecs/
-%{_qt4_datadir}/phrasebooks/
-%{_qt4_datadir}/q3porting.xml
 %{_libdir}/pkgconfig/*.pc
 %endif
 
 %changelog
+* Wed Jan 10 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.0-3
+- fix %%files of compat32-qt4-devel
+
 * Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.0-2
 - added %%pre section to remove symbolic link
 - moved translation files to each subpackage

s/slocate/slocate-vl.spec

@@ -1,24 +1,17 @@
 Summary:     Finds files on a system via a central database.
 Summary(ja): システム上のファイルをデータベースを使って検索します
 Name: slocate
-Version: 2.7
+Version: 3.1
-Release: 25%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/System
-Source0: http://ftp.debian.org/debian/pool/main/s/slocate/slocate_2.7-4.tar.gz
+Source0: slocate-3.1.tar.gz
 Source1: slocate.cron
 Source2: updatedb.conf
 Source3: updatedb.conf.5
-Patch0: slocate-2.7-4.info.patch
+Patch0: slocate-3.1-CVE-2007-0227.patch
-Patch1: slocate-wht.patch
-Patch2: slocate-2.6-manpage.patch
-Patch3: slocate-2.7-fts.patch
-Patch4: slocate-2.7-lazy-mtab.patch
-Patch5: slocate-2.7-4.autofoo.patch
-Patch6: slocate-2.7-4.bounds.patch
-Patch7: slocate-2.7-4.config.patch
 BuildRequires: gzip
-Prereq: shadow-utils
+Requires(pre): shadow-utils
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -37,32 +30,22 @@ slocate は (毎晩自動更新される) データベースを元に，指定
 
 %prep
 %setup -q
-%patch0 -p1 -b .info
+%patch0 -p1
-%patch1 -p1 -b .wht
-# *sigh*
-gunzip doc/*.gz
-%patch2 -p1 -b .manpage
-%patch3 -p1 -b .fts
-%patch4 -p1 -b .lazy
-%patch5 -p1 -b .autofoo
-%patch6 -p1 -b .bounds
-%patch7 -p1 -b .config
 
 %build
-autoreconf -f -i
+sed -i "s/local\///g" Makefile
-CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" %configure
+sed -i "s/local\///g" src/Makefile
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{1,5}}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 mkdir -p $RPM_BUILD_ROOT/var/lib/slocate
-install slocate $RPM_BUILD_ROOT%{_bindir}
+install src/slocate $RPM_BUILD_ROOT%{_bindir}
 ln -sf slocate $RPM_BUILD_ROOT%{_bindir}/locate
 ln -sf slocate $RPM_BUILD_ROOT%{_bindir}/updatedb
-install doc/slocate.1.linux $RPM_BUILD_ROOT%{_mandir}/man1/slocate.1
+install doc/slocate.1 $RPM_BUILD_ROOT%{_mandir}/man1/slocate.1
 install doc/updatedb.1 $RPM_BUILD_ROOT%{_mandir}/man1
 ln -sf slocate.1 $RPM_BUILD_ROOT%{_mandir}/man1/locate.1
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
@@ -87,7 +70,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog INSTALL README LICENSE MIRRORS
+%doc README LICENSE
 %attr(2755,root,slocate) %{_bindir}/slocate
 %attr(-,root,slocate) %{_bindir}/locate
 %attr(-,root,slocate) %{_bindir}/updatedb
@@ -98,6 +81,11 @@ fi
 
 
 %changelog
+* Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1-1
+- update to 3.1
+- remove old patches
+- add Patch0 (slocate-3.1-CVE-2007-0227.patch)
+
 * Sun Apr 17 2011 IWAI, Masaharu <iwai@alib.jp> 2.7-25vl6
 - build on current VineSeed