Browse Source

updated: autoconf213, jasper

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3473 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
41c8ce95fd
2 changed files with 43 additions and 28 deletions
  1. 34 23
      a/autoconf213/autoconf213-vl.spec
  2. 9 5
      j/jasper/jasper-vl.spec

+ 34 - 23
a/autoconf213/autoconf213-vl.spec

@@ -2,8 +2,8 @@ Summary: A GNU tool for automatically configuring source code.
 Summary(ja): ソースコードを自動的に設定するための GNU ツール
 Name: autoconf213
 Version: 2.13
-Release: 6%{?_dist_release}
-License: GPL
+Release: 7%{?_dist_release}
+License: GPLv2
 Group: Development/Tools
 URL: http://www.gnu.org/software/autoconf/
 Source0: ftp://prep.ai.mit.edu/pub/gnu/autoconf/autoconf-%{version}.tar.gz
@@ -18,10 +18,21 @@ Patch6: autoconf-2.13-exit.patch
 Patch7: autoconf-2.13-wait3test.patch
 Patch8: autoconf-2.13-make-defs-62361.patch
 Patch9: autoconf-2.13-versioning.patch
-#Prereq: /sbin/install-info
-Requires: gawk, m4, perl, coreutils
+Patch10: autoconf213-destdir.patch
+Patch11: autoconf213-info.patch
+
 BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gawk
+BuildRequires: m4
+BuildRequires: perl
+BuildRequires: texinfo
+Requires: coreutils
+Requires: gawk
+Requires: m4
+Requires: perl
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %define __find_requires %{SOURCE1}
 
@@ -69,40 +80,36 @@ Autoconf が必要になるのはスクリプトを生成するときのみで
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1 -b .version
-
+%patch10 -p1
+%patch11 -p1
+mv autoconf.texi autoconf213.texi
+rm -f autoconf.info
 
 %build
 %configure --program-suffix=-%{version}
 make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-#mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mv ${RPM_BUILD_ROOT}%{_infodir}/autoconf.info ${RPM_BUILD_ROOT}%{_infodir}/%{name}.info
+#mv $RPM_BUILD_ROOT%{_infodir}/autoconf.info $RPM_BUILD_ROOT%{_infodir}/%{name}.info
 
 # We don't want to include the standards.info stuff in the package,
 # because it comes from binutils...
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/standards*
-
-gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/*
-
-cp install-sh ${RPM_BUILD_ROOT}%{_datadir}/autoconf
-
+rm -f $RPM_BUILD_ROOT%{_infodir}/standards*
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 
-#%post
-#/sbin/install-info %{_infodir}/autoconf.info.gz %{_infodir}/dir
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 
-#%preun
-#if [ "$1" = 0 ]; then
-#    /sbin/install-info --del %{_infodir}/autoconf.info.gz %{_infodir}/dir
-#fi
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+fi
 
 %files
 %defattr(-,root,root)
@@ -113,6 +120,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Apr 11 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.13-7
+- rebuilt with perl-5.12.3
+- added Patch11 to add autoconf213 info entry
+
 * Thu Oct 09 2008 Shu KONNO <owa@bg.wakwak.com> 2.13-6
 - spec in utf-8
 

+ 9 - 5
j/jasper/jasper-vl.spec

@@ -1,12 +1,14 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Name:        jasper
-Version:     1.900.1
-Release:     7%{?_dist_release}
 Summary:     implementation of the JPEG-2000 standard, Part 1
-URL:         http://www.ece.uvic.ca/~mdadams/jasper/
+Version:     1.900.1
+Release:     8%{?_dist_release}
+
+Group:       Applications/Graphics
 License:     Modified BSD (see LICENSE)
-Group:       System Environment/Libraries
+URL:         http://www.ece.uvic.ca/~mdadams/jasper/
+
 Source:      %{name}-%{version}.zip
 # Security fixes
 Patch100:    jasper-1.900.1_CVE-2007-2721.patch
@@ -16,7 +18,6 @@ BuildRequires: libjpeg-devel unzip
 BuildRequires: freeglut-devel
 Requires:    %{name}-libs = %{version}-%{release}
 
-
 Vendor:       Project Vine
 Distribution: Vine Linux
 
@@ -121,6 +122,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %endif
 
 %changelog
+* Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.900.1-8
+- rebuilt with current VineSeed
+
 * Sat May 02 2009 NAKAMURA Kenta <kenta@vinelinux.org> 1.900.1-7
 - added compat32 subpackage for x86_64 arch support.