updated: OpenEXR, openal, exiv2, flac, namazu

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

O/OpenEXR/OpenEXR-vl.spec

@@ -1,19 +1,16 @@
-Summary: A high dynamic-range (HDR) image file format
-Summary(ja): 高ダイナミックレンジ(HDR)画像ファイルフォーマット
 
 Name:	 OpenEXR
+Summary: A high dynamic-range (HDR) image file format
+Summary(ja): 高ダイナミックレンジ(HDR)画像ファイルフォーマット
 Version: 1.6.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
+
 Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
 Source1: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz.sig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-Obsoletes: openexr < %{version}-%{release}
-Provides:  openexr = %{version}-%{release}
 
 Patch1: OpenEXR-1.6.1-pkgconfig.patch
 Patch2: openexr-1.6.1-gcc43.patch
@@ -23,37 +20,40 @@ Patch100: openexr-1.6.1-CVE-2009-1720-1.patch
 Patch101: openexr-1.6.1-CVE-2009-1720-2.patch
 Patch102: openexr-1.6.1-CVE-2009-1721.patch
 
-BuildRequires:  automake libtool
-BuildRequires:  ilmbase-devel
-BuildRequires:  zlib-devel
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: automake libtool
+BuildRequires: ilmbase-devel
+BuildRequires: zlib-devel
 Requires: %{name}-libs = %{version}-%{release}
 
+Obsoletes: openexr < %{version}-%{release}
+Provides:  openexr = %{version}-%{release}
+
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
 Light & Magic for use in computer imaging applications. This package contains
 libraries and sample applications for handling the format.
 
+%package libs
+Summary: %{name} runtime libraries
+Summary(ja): %{name} runtime libraries
+Group:   System Environment/Libraries
+
+%description libs
+%{summary}.
+
 %package devel
 Summary: Development files for %{name} 
 Summary(ja): %{name} の開発ファイル
 Group:	 Development/Libraries
-Obsoletes: openexr-devel < %{version}-%{release}
-Provides:  openexr-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ilmbase-devel
-Requires: pkgconfig
-%description devel
-%{summary}.
+Obsoletes: openexr-devel < %{version}-%{release}
+Provides:  openexr-devel = %{version}-%{release}
 
-%package libs
-Summary: %{name} runtime libraries
-Summary(ja): %{name} runtime libraries
-Group:   System Environment/Libraries
-%description libs
+%description devel
 %{summary}.
 
-
 %prep
 %setup -q -n openexr-%{version}
 
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.1-3
+- rebuilt with rpm-4.8.1 for pkg-config 
+
 * Wed Aug  5 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.6.1-2
 - add Patch100,101 for fix CVE-2009-1720 (Integer BOF)
 - add Patch102 for fix CVE-2009-1721

e/exiv2/exiv2-vl.spec

@@ -1,11 +1,13 @@
 Name: exiv2
-Version: 0.19
-Release: 1%{?_dist_release}
 Summary: Exif and IPTC metadata manipulation library
 Summary(ja): Exif, IPTC メタデータ操作ライブラリ
-License: GPL
+Version: 0.19
+Release: 2%{?_dist_release}
+
 Group: System Environment/Libraries
+License: GPL
 URL: http://www.exiv2.org/
+
 Source0: %{name}-%{version}.tar.gz
 Patch1: exiv2-0.18-deps.patch
 Patch2: exiv2-0.16-gcc43.patch
@@ -58,7 +60,6 @@ Summary: Header files, libraries and development documentation for exiv2
 Summary(ja): exiv2 の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 Obsoletes: libexiv2-devel <= 0.13
 Provides: libexiv2-devel = %{version}-%{release}
 
@@ -125,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.19-2
+- rebuilt with rpm-4.8.1 for pkg-config
+
 * Wed May  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.19-1
 - new upstream release
 - updated Patch3

f/flac/flac-vl.spec

@@ -5,21 +5,32 @@
 
 #%%define extraver beta
 
+Name:		flac
 Summary:	FLAC - Free Lossless Audio Codec
 Summary(ja):	FLAC - フリーの可逆音声圧縮コーデック
-Name:		flac
 Version:	1.2.1
-Release:	1%{?_dist_release}
-License:	GPL/LGPL
+Release:	2%{?_dist_release}
+
 Group:		Applications/Multimedia
-Source:		http://prdownloads.sourceforge.net/flac/%{name}-%{version}%{?extraver:-%extraver}.tar.gz
-Patch0:		flac-xmms-euc-jp-ms.patch
+License:        BSD and GPLv2+
 URL:		http://flac.sourceforge.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libogg
-BuildRequires:	libogg-devel
+
+Source:	http://prdownloads.sourceforge.net/flac/%{name}-%{version}%{?extraver:-%extraver}.tar.gz
+Patch1: flac-1.2.1-asm.patch
+Patch2: flac-1.2.1-gcc43.patch
+Patch3: flac-1.2.1-hidesyms.patch
+Patch4: flac-1.2.1-tests.patch
+Patch5: flac-1.2.1-cflags.patch
+Patch6: flac-1.2.1-bitreader.patch
+
+Patch10: flac-xmms-euc-jp-ms.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libogg-devel
+BuildRequires: automake autoconf libtool gettext-devel
 %ifarch %ix86
-BuildRequires:	nasm
+# 2.0 supports symbol visibility
+BuildRequires:	nasm >= 2.0
 %endif
 
 Vendor:		Project Vine
@@ -87,26 +98,46 @@ XMMS で FLAC ファイル (*.flac) を再生するための入力プラグイ
 %define srcver %{version}%{?extraver:-%extraver}
 
 %setup -q -n %{name}-%{srcver}
+%patch1 -p1 -b .asm
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .hidesyms
+# reduce number of tests
+%patch4 -p1 -b .tests
+%patch5 -p1 -b .cflags
+%patch6 -p0 -b .bitreader
 
 %if %{build_xmms_plugin}
-%patch0 -p1 -b .euc-jp-ms
+%patch10 -p1 -b .euc-jp-ms
 %endif
 
 %build
+./autogen.sh -V
+
+%configure \
+    --disable-static \
+%if !%{build_xmms_plugin}
+    --disable-xmms-plugin \
+%endif
 %ifarch ppc
-%configure --disable-static --disable-asm-optimizations
-%else
-%configure --disable-static
+    --disable-asm-optimizations \
 %endif
+    --disable-thorough-tests
+
 %__make %{?_smp_mflags}
 
 %install
 %__rm -rf %{buildroot}
 %makeinstall \
-	xmmsinputplugindir=%{buildroot}%{xmmsinputdir}
+%if %{build_xmms_plugin}
+    xmmsinputplugindir=%{buildroot}%{xmmsinputdir}
+%endif
 
 # remove unneeded files
 %{_bindir}/find %{buildroot} -name "*.la" -exec %__rm -f "{}" \;
+%{_bindir}/find doc/ -name "Makefile*" -exec %__rm -f "{}" \;
+
+%check
+make -C test check &> /dev/null
 
 %clean
 %__rm -rf %{buildroot}
@@ -138,6 +169,10 @@ XMMS で FLAC ファイル (*.flac) を再生するための入力プラグイ
 
 
 %changelog
+* Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.1-2
+- rebuilt with rpm-4.8.1 for pkg-config
+- added Patch1-6 from Fedora
+
 * Sun Jul 21 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.1-1
 - applied new versioning policy
 - spec in UTF-8

n/namazu/mknmz.vine

@@ -0,0 +1,3 @@
+#!/bin/sh
+# convert mknmz output encoding to UTF-8
+/usr/bin/mknmz.euc $* | nkf -w

n/namazu/namazu-vl.spec

@@ -8,15 +8,18 @@ Summary: Namazu is a search engine intented for easy use
 Summary(ja): 日本語全文検索エンジン
 Name: namazu
 Version: %{nmzver}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
+
 Group: Applications/Text
-License: GPL2
+License: GPLv2
 URL: http://www.namazu.org/
+
 Source0: http://www.namazu.org/stable/namazu-%{nmzver}.tar.gz
 Source1: http://www.cwo.zaq.ne.jp/vine-linux/text/TCL-scroll.txt
 Source2: namazu-vinehtml-%{vinedocver}.tar.gz
 Source3: tknamazurc.vine
 Source4: dw3m
+Source5: mknmz.vine
 
 Source10: filter-requires-namazu.sh
 %define __find_requires %{SOURCE10}
@@ -54,7 +57,7 @@ WWW 全文検索システムを構築することができるほか、ハード
 イルを対象としたようなパーソナルな用途にも使えるます。 
 
 namazu_VineDocsdb, namazu_JFdb, namazu_JMANdb をインストールすると、
-tknamazuなどから Vine のオリジナルドキュメントや、JF、jman-pages の全文
+tknamazu などから Vine のオリジナルドキュメントや、JF、jman-pages の全文
 検索をできるようになります。apacheなどでhttpdを立ち上げれば、
 http://localhost/search.html から検索をすることもできます。
 
@@ -156,6 +159,12 @@ chmod a+rwt -R %{buildroot}%{_localstatedir}/namazu/index
 #mv -f $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc-sample \
 #	$RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc
 
+# install wrapper script for mknmz
+pushd $RPM_BUILD_ROOT%{_bindir}
+mv mknmz mknmz.euc
+install -m755 %{SOURCE5} mknmz
+popd
+
 # Vine stuff below 
 # config stuff is to be installed afterwards
 rm -f %{buildroot}%{_sysconfdir}/namazu/*-sample
@@ -213,6 +222,7 @@ esac
 %{_bindir}/namazu
 %{_bindir}/bnamazu
 %{_bindir}/*nmz
+%{_bindir}/mknmz.euc
 %{_bindir}/mailutime
 %{_bindir}/nmzcat
 %{_bindir}/nmzegrep
@@ -249,6 +259,9 @@ esac
 %{_datadir}/tknamazu/*
 
 %changelog
+* Sun Sep 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.20-3
+- added SOURCE5 for <BTS:965>
+
 * Wed Apr 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.20-2
 - fixed build dependencies
 - updated SOURCE10

o/openal/openal-vl.spec

@@ -2,17 +2,21 @@ Name:		openal
 Summary:	Open Audio Library
 Summary(ja):	オープンオーディオライブラリ
 Version:	0.0.8
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Epoch:		1
 Source:		openal-%{version}.tar.gz
 
+Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.openal.org
-Group:		System Environment/Libraries
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: alsa-lib-devel, esound-devel, arts-devel, SDL-devel, libvorbis-devel
-BuildRequires: automake, autoconf
+BuildRequires: alsa-lib-devel
+BuildRequires: arts-devel
+BuildRequires: esound-devel
+BuildRequires: libvorbis-devel
+BuildRequires: SDL-devel
+#BuildRequires: automake, autoconf
 Obsoletes: libopenal0, libopenal0-devel
 
 %description
@@ -32,7 +36,7 @@ applications which will use OpenAL, a free 3D audio library.
 %setup -q
 
 %build
-%configure
+%configure --disable-static
 %__make %{?_smp_mflags}
 
 %install
@@ -70,10 +74,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/openal-config
 %{_includedir}/AL/*.h
 %{_libdir}/*.so
-%{_libdir}/*.a
+#{_libdir}/*.a
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:0.0.8-2
+- rebuilt with rpm-4.8.1 for pkg-config 
+- removed static libraries from devel package
+
 * Mon Sep 29 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:0.0.8-1vl5
 - applied new versioning policy
 - spec in UTF-8