Browse Source

update: id3lib, tmpwatch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3137 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
62193b2228
2 changed files with 27 additions and 10 deletions
  1. 16 5
      i/id3lib/id3lib-vl.spec
  2. 11 5
      t/tmpwatch/tmpwatch-vl.spec

+ 16 - 5
i/id3lib/id3lib-vl.spec

@@ -1,15 +1,20 @@
+Name:		id3lib
 Summary:	A software library for manipulating ID3v1 and ID3v2 tags
 Summary(ja):	ID3v1/v2 タグを扱うためのライブラリ
-Name:		id3lib
 Version:	3.8.3
-Release:	1%{?_dist_release}
-License:	LGPL
+Release:	2%{?_dist_release}
+
+Group:		System Environment/Libraries
+License:	LGPLv2
+URL:		http://id3lib.sourceforge.net/
+
 Source:		http://prdownloads.sourceforge.net/id3lib/id3lib-%{version}.tar.gz
 Patch0:		http://prdownloads.sourceforge.net/easytag/patch_id3lib_3.8.3_UTF16_writing_bug.diff
 Patch1:		id3lib-3.8.3-fix-id3v2-latest.patch
 Patch2:		id3lib-3.8.3-mkstemp.patch
-URL:		http://id3lib.sourceforge.net/
-Group:		System Environment/Libraries
+Patch3:         id3lib-3.8.3-includes.patch
+Patch4:         http://launchpadlibrarian.net/33114077/id3lib-vbr_buffer_overflow.diff
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	zlib-devel
 
@@ -53,6 +58,9 @@ tag manipulation.
 %patch0 -p1 -b .UTF-16
 %patch1 -p1 -b .id3v2-latest
 %patch2 -p1 -b .mkstemp
+%patch3 -p1 -b .gcc43
+%patch4 -p1
+chmod -x src/*.h src/*.cpp include/id3/*.h
 
 %build
 %configure --enable-debug=no --enable-static=no
@@ -89,6 +97,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.8.3-2
+- added Patch3 to build with current toolchain
+
 * Sun Jun 15 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.8.3-1
 - applied new versioning policy
 - removed lib*.la files from devel package

+ 11 - 5
t/tmpwatch/tmpwatch-vl.spec

@@ -1,14 +1,16 @@
 Summary: A utility for removing files based on when they were last accessed.
 Summary(ja): 古いものから順にファイルを削除するユーティリティ
 Name: tmpwatch
-Version: 2.9.14
+Version: 2.10.1
 Release: 1%{?_dist_release}
+
+Group: System Environment/Base
+License: GPLv2
 URL: https://fedorahosted.org/tmpwatch/
 
 Source0: %{name}-%{version}.tar.bz2
 Source1: tmpwatch.daily
-License: GPLv2
-Group: System Environment/Base
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: psmisc
 
@@ -33,11 +35,12 @@ tmpwatch は通常一時保存ファイルを置くディレクトリ (例えば
 %setup -q
 
 %build
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags} 
 
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-make ROOT=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
+make DESTDIR=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
 
 mkdir -p %{buildroot}/etc/cron.daily
 cp %{SOURCE1} %{buildroot}/etc/cron.daily/tmpwatch
@@ -54,6 +57,9 @@ chmod +x %{buildroot}/etc/cron.daily/tmpwatch
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Sat Mar 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.10.1-1
+- new upstream release
+
 * Wed Apr 15 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.9.14-1
 - new upstream release
 - spec in utf-8