update: flex, psmisc

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

f/flex/flex-vl.spec

@@ -2,15 +2,20 @@ Summary: A tool for creating scanners (text pattern recognizers).
 Summary(ja): スキャナ (テキストパターン認識器) 作成ツール
 Name: flex
 Version: 2.5.35
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
-License: BSD
+
 Group: Development/Tools
+License: BSD
 URL: http://flex.sourceforge.net/
+
 Source: flex-%{version}.tar.bz2
-Patch0: flex-2.5.35-pic.patch
+Patch0: flex-2.5.35-sign.patch
+Patch1: flex-2.5.35-hardening.patch
+Patch2: flex-2.5.35-gcc44.patch
+Patch3: flex-2.5.35-missing-prototypes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gettext info bison m4
+BuildRequires: gettext bison m4
 Requires: m4
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -45,10 +50,13 @@ C のコードを入力とし，C のソースファイルを出力します．
 %prep
 %setup -q 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +99,23 @@ fi
 %{_infodir}/flex.info*
 
 %changelog
+* Sat Apr 09 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.5.35-3
+- rebuilt with current VineSeed
+- inserted the "-fPIC" on configure command-line and dropt the -fPIC patch.
+- removed BR: info
+- added Patch0-3 from Fedora
+  * Tue Jul 13 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-10
+  - Declare yyget_column and yyset_column in reentrant mode.
+  - Resolves: #612465
+  * Mon Apr 20 2009 Debarshi Ray <rishi@fedoraproject.org> - 2.5.35-5
+  - Resolves: #496548.
+  * Mon Apr 20 2009 Petr Machata <pmachata@redhat.com> - 2.5.35-4
+  - Get rid of warning caused by ignoring return value of fwrite() in
+    ECHO macro.  Debian patch.
+  - Resolves: #484961
+  * Mon May 12 2008 Petr Machata <pmachata@redhat.com> - 2.5.35-2
+  - Resolves: #445950
+
 * Wed Apr 01 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.5.35-2
 - spec in utf-8
 

p/psmisc/psmisc-vl.spec

@@ -1,20 +1,24 @@
-%define with_pidof 0
+Name: psmisc
-
 Summary:     Utilities for managing processes on your system.
 Summary(ja): システムのプロセスを管理するユーティリティ
-Name: psmisc
+Version: 22.13
-Version: 22.6
+Release: 1%{?_dist_release}
-Release: 2%{?_dist_release}
+
-License: BSD/GPLv2+
 Group: Applications/System
+License: GPLv2+
+URL: http://sourceforge.net/projects/psmisc
+
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
-Patch0: psmisc-22.6-types.patch
+Patch1: psmisc-22.13-peekfd-segv.patch
-Patch1: psmisc-22.6-pstree-overflow.patch
+Patch2: psmisc-22.13-fuser-silent.patch
+Patch3: psmisc-22.13-killall-pgid.patch
+Patch4: psmisc-22.13-ppc64.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gettext ncurses-devel
+BuildRequires: gettext
+BuildRequires: ncurses-devel
 BuildRequires: autoconf automake
 
-
 %description
 The psmisc package contains utilities for managing processes on your
 system: pstree, killall and fuser.  The pstree command displays a tree
@@ -35,12 +39,12 @@ fuser コマンドは，指定したファイルやファイルシステムを
 
 %prep
 %setup -q
-%patch0 -p1 -b .types
+%patch1 -p1
-%patch1 -p1 -b .pstree-overflow
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-autoreconf
 %configure --prefix=%{_prefix}
 make %{?_smp_mflags}
 
@@ -51,12 +55,8 @@ make install DESTDIR="$RPM_BUILD_ROOT"
 mkdir -p $RPM_BUILD_ROOT%{_syssbindir}
 mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_syssbindir}
 
-%if ! %{with_pidof}
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1*
-%endif
-rm -f $RPM_BUILD_ROOT/%{_bindir}/oldfuser
-
 %ifnarch %ix86 x86_64 ppc ppc64
+rm -f $RPM_BUILD_ROOT/%{_bindir}/peekfd
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/peekfd.1*
 %endif
 
@@ -68,20 +68,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING README
 %{_syssbindir}/fuser
 %{_bindir}/killall
 %{_bindir}/pstree
 %{_bindir}/pstree.x11
+%{_bindir}/prtstat
 %{_mandir}/man1/fuser.1*
 %{_mandir}/man1/killall.1*
 %{_mandir}/man1/pstree.1*
+%{_mandir}/man1/prtstat.1*
 %ifarch %ix86 x86_64 ppc ppc64
 %{_bindir}/peekfd
 %{_mandir}/man1/peekfd.1*
 %endif
 
-
 %changelog
+* Sat Apr  9 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 22.13-1
+- updated to 22.13
+- added Patch1-4 from Fedora
+  * Thu Jan 27 2011 Jan Görig <jgorig@redhat.com> 22.13-7
+  - fix #671135 - peekfd utility doesn't work on ppc64 architecture
+  * Fri Jan 7 2011 Jan Görig <jgorig@redhat.com> 22.13-6
+  - fix #666213 - uninitialized memory leading to `killall -g name` failure
+  * Tue Nov 16 2010 Jan Görig <jgorig@redhat.com> 22.13-5
+  - fix #651794 - incorrect exit code of fuser -m -s
+  * Thu Oct 14 2010 Jan Görig <jgorig@redhat.com> 22.13-3
+  - fix #642800 - peekfd regression
+
 * Mon Aug 18 2008 Shu KONNO <owa@bg.wakwak.com> 22.6-2
 - added psmisc-22.6-types.patch by fedora
 - added psmisc-22.6-pstree-overflow.patch by fedora