[svn] r9815 - in /trunk/rpms: 2hash/ autopsy/ bandwidth/ cdiff/ clamav/ cryptcat/ fatback/ feh/ fio/ flash-plugin/ foremost/ gscan2pdf/ gstreamer-plugins-bad/ hardlink++/ kismet/ lft/ lftp/ linphone/ lksctp-tools/ lsdvd/ lyx/ monitorix/ mpeg4ip/ mpg123/ mplayer/ mrtg/ ms-sys/ pasco/ pcsc-lite-acr38u/ perl-Data-Hexify/ perl-File-Mork/ perl-MooseX-Params-Validate/ pptp/ rear/ reglookup/ rtorrent/ stegdetect/ xrdp/

Dag Wieers dag at wieers.com
Wed Apr 13 02:34:34 CEST 2011


Author: dag
Date: Wed Apr 13 01:34:33 2011
New Revision: 9815

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9815&view=rev
Log:
Updates

Added:
    trunk/rpms/2hash/
    trunk/rpms/2hash/2hash.spec   (with props)
    trunk/rpms/fatback/
    trunk/rpms/fatback/fatback.spec   (with props)
    trunk/rpms/lyx/lyx-1.5.spec   (with props)
    trunk/rpms/pasco/
    trunk/rpms/pasco/pasco.spec   (with props)
    trunk/rpms/perl-Data-Hexify/
    trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec   (with props)
    trunk/rpms/perl-File-Mork/
    trunk/rpms/perl-File-Mork/perl-File-Mork.spec   (with props)
    trunk/rpms/pptp/
    trunk/rpms/pptp/pptp-1.7.2-compat.patch
    trunk/rpms/pptp/pptp-1.7.2-ip-path.patch
    trunk/rpms/pptp/pptp-1.7.2-makedeps.patch
    trunk/rpms/pptp/pptp-1.7.2-pptpsetup-encrypt.patch
    trunk/rpms/pptp/pptp-1.7.2-pptpsetup-mppe.patch
    trunk/rpms/pptp/pptp-1.7.2-pptpsetup.patch
    trunk/rpms/pptp/pptp.spec   (with props)
    trunk/rpms/stegdetect/
    trunk/rpms/stegdetect/stegdetect-0.6-configure.patch
    trunk/rpms/stegdetect/stegdetect.spec   (with props)
    trunk/rpms/xrdp/
    trunk/rpms/xrdp/xrdp-0.4.0-docs.patch
    trunk/rpms/xrdp/xrdp-0.4.0-sesman.patch
    trunk/rpms/xrdp/xrdp-0.4.0-sesmantools.patch
    trunk/rpms/xrdp/xrdp.spec   (with props)
Modified:
    trunk/rpms/autopsy/autopsy.spec
    trunk/rpms/bandwidth/bandwidth.spec
    trunk/rpms/cdiff/cdiff.spec
    trunk/rpms/clamav/clamav.spec
    trunk/rpms/cryptcat/cryptcat.spec
    trunk/rpms/feh/feh.spec
    trunk/rpms/fio/fio.spec
    trunk/rpms/flash-plugin/flash-plugin.spec
    trunk/rpms/foremost/foremost.spec
    trunk/rpms/gscan2pdf/gscan2pdf.spec
    trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
    trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.8.spec
    trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
    trunk/rpms/hardlink++/hardlink++.spec
    trunk/rpms/kismet/kismet.spec
    trunk/rpms/lft/lft.spec
    trunk/rpms/lftp/lftp.spec
    trunk/rpms/linphone/linphone.spec
    trunk/rpms/lksctp-tools/lksctp-tools.spec
    trunk/rpms/lsdvd/lsdvd.spec
    trunk/rpms/lyx/lyx.spec
    trunk/rpms/monitorix/monitorix.spec
    trunk/rpms/mpeg4ip/mpeg4ip.spec
    trunk/rpms/mpg123/mpg123.spec
    trunk/rpms/mplayer/mplayer.spec
    trunk/rpms/mrtg/mrtg.spec
    trunk/rpms/ms-sys/ms-sys.spec
    trunk/rpms/pcsc-lite-acr38u/pcsc-lite-acr38u.spec
    trunk/rpms/perl-MooseX-Params-Validate/perl-MooseX-Params-Validate.spec
    trunk/rpms/rear/rear.spec
    trunk/rpms/reglookup/reglookup.spec
    trunk/rpms/rtorrent/rtorrent.spec

Added: trunk/rpms/2hash/2hash.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/2hash/2hash.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/2hash/2hash.spec (added)
+++ trunk/rpms/2hash/2hash.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,49 @@
+# $Id$
+# Authority: dag
+
+Summary: Tool to simultaneous do MD5 and SHA1 hashing
+Name: 2hash
+Version: 0.2
+Release: 1%{?dist}
+License: GPL
+Group: Applications/File
+URL: http://trog.qgl.org/20061027/2hash-simultaneous-md5-and-sha1-hashing/
+
+Source: http://trog.qgl.org/download.php/2hash-v%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++
+#BuildRequires: glibc-static
+BuildRequires: libstdc++-devel
+
+%description
+2hash simultaneously performs a md5 and a sha1 checksum on file(s).
+If you want two checksums for additionally integrity checking, you previously
+had to run md5sum and sha1sum serially causing the integrity checks to
+take 100% longer than running a single check alone. 2hash runs both hashes
+in parallel, only having to read the file once. It allows you to 
+get both hash values with only about an 8% time increase over md5 alone,
+and only about a 2% time increase over sha1 alone. It runs about 90%
+quicker than using both md5 and sha1 one after the other... 
+
+%prep
+%setup -n %{name}-v%{version}
+
+%build
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install bindir="%{buildroot}%{_bindir}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc INSTALL README
+%{_bindir}/2hash
+
+%changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 0.2-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/2hash/2hash.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/2hash/2hash.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/autopsy/autopsy.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/autopsy/autopsy.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/autopsy/autopsy.spec (original)
+++ trunk/rpms/autopsy/autopsy.spec Wed Apr 13 01:34:33 2011
@@ -4,7 +4,7 @@
 
 Summary: Forensic browser for use with Sleuth Kit
 Name: autopsy
-Version: 2.00
+Version: 2.24
 Release: 1.2%{?dist}
 License: GPL
 Group: Applications/Internet
@@ -14,8 +14,17 @@
 Patch0: autopsy.patch-1.74
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires: sleuthkit >= 1.61
-Provides: perl(conf.pl), perl(define.pl), perl(fs.pl), perl(search.pl), perl(autopsyfunc)
+BuildArch: noarch
+Requires: binutils
+Requires: coreutils
+Requires: file
+Requires: grep
+Requires: perl
+Requires: sleuthkit >= 3.1
+
+%filter_from_provides /^perl*/d
+%filter_from_requires /^perl*/d
+%filter_setup
 
 %description
 The Autopsy forensic browser is a graphical interface to utilities
@@ -51,10 +60,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_datadir}/autopsy/ \
-			%{buildroot}%{_localstatedir}/log/autopsy/ \
-			%{buildroot}%{_localstatedir}/morgue/ \
-			%{buildroot}%{_mandir}/man1/
+%{__install} -d -m0755 %{buildroot}%{_datadir}/autopsy/
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/autopsy/
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/morgue/
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/
 %{__install} -Dp -m0755 autopsy %{buildroot}%{_sbindir}/autopsy
 %{__install} -p -m0755 autopsyfunc.pm fs.pl search.pl %{buildroot}%{_datadir}/autopsy/
 %{__install} -Dp -m0600 conf.pl %{buildroot}%{_datadir}/autopsy/conf.pl
@@ -78,9 +87,6 @@
 %{_datadir}/autopsy/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.00-1.2
-- Rebuild for Fedora Core 5.
-
 * Wed Mar 31 2004 Dag Wieers <dag at wieers.com> - 2.00-1
 - Fix installation.
 

Modified: trunk/rpms/bandwidth/bandwidth.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/bandwidth/bandwidth.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/bandwidth/bandwidth.spec (original)
+++ trunk/rpms/bandwidth/bandwidth.spec Wed Apr 13 01:34:33 2011
@@ -4,13 +4,13 @@
 
 Summary: Artificial benchmark for measuring memory bandwidth
 Name: bandwidth
-Version: 0.15
+Version: 0.26c
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://home.comcast.net/~fbui/bandwidth.html
 
-Source: http://home.comcast.net/~fbui/bandwidth-%{version}.tar.gz
+Source: http://home.comcast.net/~fbui/bandwidth-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -21,22 +21,35 @@
 %setup
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
+%ifarch %{ix86}
+%{__make} bandwidth32
+%endif
+%ifarch x86_64
+%{__make} bandwidth64
+%endif
 
 %install
 %{__rm} -rf %{buildroot}
 #%{__make} install DESTDIR="%{buildroot}"
-%{__install} -Dp -m0755 bandwidth %{buildroot}%{_bindir}/bandwidth
+%ifarch %{ix86}
+%{__install} -Dp -m0755 bandwidth32 %{buildroot}%{_bindir}/bandwidth
+%endif
+%ifarch x86_64
+%{__install} -Dp -m0755 bandwidth64 %{buildroot}%{_bindir}/bandwidth
+%endif
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc COPYING README
+%doc COPYING.txt README.txt
 %{_bindir}/bandwidth
 
 %changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 0.26c-1
+- Updated to release 0.26c.
+
 * Sat Nov 08 2008 Dag Wieers <dag at wieers.com> - 0.15-1
 - Updated to release 0.15.
 

Modified: trunk/rpms/cdiff/cdiff.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/cdiff/cdiff.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/cdiff/cdiff.spec (original)
+++ trunk/rpms/cdiff/cdiff.spec Wed Apr 13 01:34:33 2011
@@ -1,5 +1,7 @@
 # $Id$
 # Authority: dag
+
+%define _default_patch_fuzz 2
 
 Summary: Diff readability enhancer for color terminals
 Name: cdiff

Modified: trunk/rpms/clamav/clamav.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/clamav/clamav.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/clamav/clamav.spec (original)
+++ trunk/rpms/clamav/clamav.spec Wed Apr 13 01:34:33 2011
@@ -396,8 +396,8 @@
 %exclude %{_libdir}/libclamunrar_iface.la
 
 %changelog
-* Wed Feb 09 2011 David Hrbáč <david at hrbac.cz> - 0.97-1
-- new upstream release
+* Tue Feb 08 2011 Dag Wieers <dag at wieers.com> - 0.97-1
+- Updated to release 0.97.
 
 * Tue Nov 30 2010 Dag Wieers <dag at wieers.com> - 0.96.5-1
 - Updated to release 0.96.5.

Modified: trunk/rpms/cryptcat/cryptcat.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/cryptcat/cryptcat.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/cryptcat/cryptcat.spec (original)
+++ trunk/rpms/cryptcat/cryptcat.spec Wed Apr 13 01:34:33 2011
@@ -5,14 +5,15 @@
 
 Summary: Standard netcat enhanced with twofish encryption.
 Name: cryptcat
-Version: 0.0.20031202
-Release: 1.2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
-URL: http://farm9.org/Cryptcat/
+URL: http://cryptcat.sourceforge.net/
 
-Source: http://farm9.org/Cryptcat/cryptcat_%{real_version}.tar.gz
+Source: http://dl.sf.net/project/cryptcat/cryptcat-unix-1.2/cryptcat-unix-1.2.1/cryptcat-unix-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: gcc-c++
 
 %description
@@ -20,27 +21,27 @@
 netcat was origianally written by the l0pht (hobbit and weld pond).
 
 %prep
-%setup -n %{name}_%{real_version}
+%setup -c %{name}-%{version}
 
 %build
-%{__perl} -pi -e 's|STATIC=-static||g;' Makefile
-%{__make} linux XLIBS=-lstdc++
+%{__perl} -pi -e 's|STATIC=-static||g;' unix/Makefile
+%{__make} -C unix linux
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -Dp -m0755 cryptcat %{buildroot}%{_bindir}/cryptcat
+%{__install} -Dp -m0755 unix/cryptcat %{buildroot}%{_bindir}/cryptcat
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changelog README*
+%doc unix/Changelog unix/Credits unix/README*
 %{_bindir}/cryptcat
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.0.20031202-1.2
-- Rebuild for Fedora Core 5.
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 1.2.1-1
+- Updated to release 1.2.1.
 
 * Sun Mar 28 2004 Dag Wieers <dag at wieers.com> - 0.0.20031202-1
 - Initial package. (using DAR)

Added: trunk/rpms/fatback/fatback.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/fatback/fatback.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/fatback/fatback.spec (added)
+++ trunk/rpms/fatback/fatback.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,57 @@
+# $Id$
+# Authority: dag
+
+Summary: Tool for recovering files from FAT file systems
+Name: fatback
+Version: 1.3
+Release: 1%{?dist}
+License: GPL
+Group: Applications/File
+URL: http://sourceforge.net/projects/fatback/
+
+Source: http://dl.sf.net/project/fatback/fatback/fatback-%{version}/fatback-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: flex
+
+%description
+Fatback is a forensic tool for undeleting files from Microsoft FAT
+file systems.  Fatback is different from other undelete tools in that
+it does the following:
+
+   * Runs under UNIX environments (only Linux and FreeBSD tested so far)
+   * Can undelete files automatically
+   * Supports Long File Names
+   * Supports FAT12, FAT16, and FAT32
+   * Powerful interactive mode
+   * Recursively undeletes deleted directories
+   * Recovers lost cluster chains
+   * Works with single partitions or whole disks
+
+%prep
+%setup
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+### Clean up buildroot
+%{__rm} -f %{buildroot}%{_infodir}/dir
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+%doc %{_infodir}/fatback-manual.info*
+%doc %{_mandir}/man1/fatback.1*
+%{_bindir}/fatback
+
+%changelog
+* Tue Feb 15 2011 Dag Wieers <dag at wieers.com> - 1.3-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/fatback/fatback.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/fatback/fatback.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/feh/feh.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/feh/feh.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/feh/feh.spec (original)
+++ trunk/rpms/feh/feh.spec Wed Apr 13 01:34:33 2011
@@ -7,7 +7,7 @@
 
 Summary: Fast command line image viewer using Imlib2
 Name: feh
-Version: 1.10.1
+Version: 1.12
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
@@ -60,6 +60,15 @@
 %exclude %{_docdir}/feh/
 
 %changelog
+* Mon Mar 14 2011 Dag Wieers <dag at wieers.com> - 1.12-1
+- Updated to release 1.12.
+
+* Thu Jan 27 2011 Dag Wieers <dag at wieers.com> - 1.11.1-1
+- Updated to release 1.11.1.
+
+* Wed Jan 26 2011 Dag Wieers <dag at wieers.com> - 1.11-1
+- Updated to release 1.11.
+
 * Sat Dec 04 2010 Dag Wieers <dag at wieers.com> - 1.10.1-1
 - Updated to release 1.10.1.
 

Modified: trunk/rpms/fio/fio.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/fio/fio.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/fio/fio.spec (original)
+++ trunk/rpms/fio/fio.spec Wed Apr 13 01:34:33 2011
@@ -4,7 +4,7 @@
 
 Summary: I/O benchmark and stress/hardware verification tool
 Name: fio
-Version: 1.41
+Version: 1.50
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -53,6 +53,9 @@
 #%{_libdir}/fio/
 
 %changelog
+* Wed Jan 26 2011 Dag Wieers <dag at wieers.com> - 1.50-1
+- Updated to release 1.50.
+
 * Fri Jun 18 2010 Dag Wieers <dag at wieers.com> - 1.41-1
 - Updated to release 1.41.
 

Modified: trunk/rpms/flash-plugin/flash-plugin.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/flash-plugin/flash-plugin.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/flash-plugin/flash-plugin.spec (original)
+++ trunk/rpms/flash-plugin/flash-plugin.spec Wed Apr 13 01:34:33 2011
@@ -10,7 +10,7 @@
 
 Summary: Macromedia Flash Player
 Name: flash-plugin
-Version: 10.1.102.65
+Version: 10.2.153.1
 Release: 0.1%{?dist}
 License: Commercial
 Group: Applications/Internet
@@ -68,6 +68,12 @@
 %{_libdir}/flash-plugin/
 
 %changelog
+* Wed Mar 23 2011 Dag Wieers <dag at wieers.com> - 10.2.153.1-0.1
+- Updated to release 10.2.153.1.
+
+* Thu Feb 10 2011 Dag Wieers <dag at wieers.com> - 10.2.152.27-0.1
+- Updated to release 10.2.152.27.
+
 * Fri Dec 03 2010 Dag Wieers <dag at wieers.com> - 10.1.102.65-0.1
 - Updated to release 10.1.102.65.
 

Modified: trunk/rpms/foremost/foremost.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/foremost/foremost.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/foremost/foremost.spec (original)
+++ trunk/rpms/foremost/foremost.spec Wed Apr 13 01:34:33 2011
@@ -4,7 +4,7 @@
 
 Summary: Recover files based on their headers and footers
 Name: foremost
-Version: 1.5.4
+Version: 1.5.7
 Release: 1%{?dist}
 License: freeware
 Group: Applications/Archiving
@@ -30,7 +30,7 @@
 %{__rm} -rf %{buildroot}
 %{__install} -Dp -m0755 foremost %{buildroot}%{_sbindir}/foremost
 %{__install} -Dp -m0644 foremost.conf %{buildroot}%{_sysconfdir}/foremost.conf
-%{__install} -Dp -m0644 foremost.1 %{buildroot}%{_mandir}/man1/foremost.1
+%{__install} -Dp -m0644 foremost.8.gz %{buildroot}%{_mandir}/man8/foremost.8.gz
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -38,11 +38,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES README
-%doc %{_mandir}/man1/foremost.1*
+%doc %{_mandir}/man8/foremost.8*
 %config %{_sysconfdir}/foremost.conf
 %{_sbindir}/foremost
 
 %changelog
+* Tue Feb 15 2011 Dag Wieers <dag at wieers.com> - 1.5.7-1
+- Updated to release 1.5.7.
+
 * Sat Nov 08 2008 Dag Wieers <dag at wieers.com> - 1.5.4-1
 - Updated to release 1.5.4.
 

Modified: trunk/rpms/gscan2pdf/gscan2pdf.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/gscan2pdf/gscan2pdf.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/gscan2pdf/gscan2pdf.spec (original)
+++ trunk/rpms/gscan2pdf/gscan2pdf.spec Wed Apr 13 01:34:33 2011
@@ -8,8 +8,8 @@
 
 Summary: Graphical tool for producing a multipage PDF from a scan
 Name: gscan2pdf
-Version: 0.9.31
-Release: 2%{?dist}
+Version: 0.9.32
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://gscan2pdf.sourceforge.net/
@@ -91,6 +91,9 @@
 %{_datadir}/pixmaps/gscan2pdf.svg
 
 %changelog
+* Mon Feb 14 2011 Dag Wieers <dag at wieers.com> - 0.9.32-1
+- Updated to release 0.9.32.
+
 * Thu Jul 22 2010 Dag Wieers <dag at wieers.com> - 0.9.31-1
 - Updated to release 0.9.31.
 

Modified: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec (original)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec Wed Apr 13 01:34:33 2011
@@ -1,6 +1,8 @@
 # $Id$
 # Authority: matthias
 # ExclusiveDist: fc5 fc6 el5 fc7
+
+%define _without_directfb 1
 
 %define desktop_vendor rpmforge
 
@@ -32,7 +34,7 @@
 Buildrequires: libXt-devel
 
 BuildRequires: liboil-devel
-BuildRequires: directfb-devel >= 1.0.1
+%{!?_without_directfb:BuildRequires: directfb-devel >= 1.0.1}
 BuildRequires: libdca-devel
 BuildRequires: faac-devel
 BuildRequires: faad2-devel

Modified: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.8.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.8.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.8.spec (original)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.8.spec Wed Apr 13 01:34:33 2011
@@ -2,18 +2,21 @@
 # Authority: matthias
 # ExclusiveDist: fc5 fc6 el5 fc7
 
+%define _without_directfb 1
+%define _without_x264 1
+
 %define desktop_vendor rpmforge
 
-%define majorminor   0.10
-%define gstreamer    gstreamer
-
-%define gst_minver   0.10.10.1
+%define majorminor 0.10
+%define gstreamer gstreamer
+
+%define gst_minver 0.10.10.1
 %define gstpb_minver 0.10.10.1
 
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad
 Version: 0.10.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
@@ -25,31 +28,30 @@
 BuildRequires: %{gstreamer}-devel >= %{gst_minver}
 BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
 
+BuildRequires: bzip2-devel
+%{!?_without_directfb:BuildRequires: directfb-devel >= 1.0.1}
+BuildRequires: faac-devel
+BuildRequires: faad2-devel
 BuildRequires: gcc-c++
 BuildRequires: gettext-devel
+BuildRequires: gsm-devel
 BuildRequires: gtk-doc
-BuildRequires: PyXML
-Buildrequires: libXt-devel
-
-BuildRequires: bzip2-devel
-BuildRequires: directfb-devel >= 1.0.1
-BuildRequires: faac-devel
-BuildRequires: faad2-devel
-BuildRequires: gsm-devel
 BuildRequires: libdca-devel
 BuildRequires: libmms-devel
 BuildRequires: libmpcdec-devel
 BuildRequires: libmusicbrainz-devel
 BuildRequires: liboil-devel
+Buildrequires: libXt-devel
 BuildRequires: mesa-libGLU-devel
 BuildRequires: mjpegtools
 BuildRequires: neon-devel
+BuildRequires: PyXML
 BuildRequires: SDL-devel
 BuildRequires: soundtouch-devel
 #BuildRequires: swfdec-devel
 #Buildrequires: wavpack-devel
 BuildRequires: xvidcore-devel
-BuildRequires: x264-devel
+%{!?_without_x264:BuildRequires: x264-devel}
 
 %ifarch %{ix86}
 BuildRequires: divx4linux
@@ -89,6 +91,8 @@
 %configure \
     --disable-gtk-doc \
     --disable-static \
+%{?_without_directfb:--disable-directfb} \
+%{?_without_x264:--disable-x264} \
     --enable-debug \
     --with-package-name="gst-plugins-bad %{desktop_vendor} rpm" \
     --with-package-origin="http://www.rpmforge.net/"
@@ -113,7 +117,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so
+%{!?_without_directfb:%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so}
 %{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
 %ifarch %{ix86}
 %{_libdir}/gstreamer-%{majorminor}/libgstdivxdec.so
@@ -171,7 +175,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
 #%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
-%{_libdir}/gstreamer-%{majorminor}/libgstx264.so
+%{!?_without_x264:%{_libdir}/gstreamer-%{majorminor}/libgstx264.so}
 #%{_libdir}/gstreamer-%{majorminor}/libgstxingheader.so
 %{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
 %{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so
@@ -187,6 +191,10 @@
 %exclude %{_libdir}/libgstapp-0.10.la
 
 %changelog
+* Sun Dec 05 2010 Dag Wieers <dag at wieers.com> - 0.10.8-5
+- Disabled directfb support.
+- Disabled x264 support. (Doesn't work with latest x264)
+
 * Fri Nov 06 2009 Dag Wieers <dag at wieers.com> - 0.10.8-4
 - Rebuild against newer faad2 2.7.
 

Modified: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec (original)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec Wed Apr 13 01:34:33 2011
@@ -2,21 +2,23 @@
 # Authority: dag
 # ExclusiveDist: el6
 
+%define _without_directfb 1
+
 %{?el6:%define _without_jack 1}
 %{?el6:%define _without_soundtouch 1}
 
 %define desktop_vendor rpmforge
 
-%define majorminor   0.10
-%define gstreamer    gstreamer
-
-%define gst_minver   0.10.10.1
+%define majorminor 0.10
+%define gstreamer gstreamer
+
+%define gst_minver 0.10.10.1
 %define gstpb_minver 0.10.10.1
 
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad
 Version: 0.10.19
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
@@ -30,7 +32,7 @@
 Requires: %{gstreamer} >= %{gst_minver}
 
 BuildRequires: bzip2-devel
-BuildRequires: directfb-devel
+%{!?_without_directfb:BuildRequires: directfb-devel}
 BuildRequires: dirac-devel
 BuildRequires: faac-devel
 BuildRequires: faad2-devel
@@ -55,8 +57,10 @@
 BuildRequires: mesa-libGLU-devel
 %{!?_without_mjpegtools:BuildRequires: mjpegtools-devel}
 BuildRequires: neon-devel
+%{!?_without_orc:BuildRequires: orc-devel}
 BuildRequires: PyXML
 BuildRequires: SDL-devel
+%{!?_without_schroedinger:BuildRequires: schroedinger}
 %{!?_without_soundtouch:BuildRequires: soundtouch-devel}
 #BuildRequires: swfdec-devel
 Buildrequires: wavpack-devel
@@ -79,6 +83,7 @@
 %build
 %configure \
     --disable-static \
+%{?_without_directfb:--disable-directfb} \
     --enable-debug \
     --with-package-name="gst-plugins-bad %{desktop_vendor} rpm" \
     --with-package-origin="http://www.rpmforge.net/"
@@ -100,8 +105,9 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstamrwbenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstasfmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
+%{!?_without_orc:%{_libdir}/gstreamer-%{majorminor}/libgstcog.so}
 %{_libdir}/gstreamer-%{majorminor}/libgstdc1394.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so
+%{!?_without_directfb:%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so}
 %{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtsdec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdvdspu.so
@@ -119,6 +125,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstneonhttpsrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstqtmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstreal.so
+%{!?_without_schroedinger:%{_libdir}/gstreamer-%{majorminor}/libgstschro.so}
 %{_libdir}/gstreamer-%{majorminor}/libgstsiren.so
 #%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
@@ -200,6 +207,9 @@
 %exclude %{_libdir}/gstreamer-%{majorminor}/*.la
 
 %changelog
+* Sun Dec 05 2010 Dag Wieers <dag at wieers.com> - 0.10.19-3
+- Disabled directfb support.
+
 * Wed Nov 17 2010 Dag Wieers <dag at wieers.com> - 0.10.19-2
 - Added libkate dependency.
 

Modified: trunk/rpms/hardlink++/hardlink++.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/hardlink%2B%2B/hardlink%2B%2B.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/hardlink++/hardlink++.spec (original)
+++ trunk/rpms/hardlink++/hardlink++.spec Wed Apr 13 01:34:33 2011
@@ -7,44 +7,42 @@
 Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
+URL: http://www.sodarock.com/hardlink/
+
 Source: http://www.sodarock.com/hardlink/hardlink++-%{version}.tgz
 Patch0: hardlink++-0.02-stdio.patch
 Patch1: hardlink++-0.02-sane-makefile.patch
 Patch2: hardlink++-0.02-gcc34-optimize-help.patch
-URL: http://www.sodarock.com/hardlink/
+Patch3: hardlink++-0.02-cstdlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: gcc-c++
 
 %description
 A rewrite in C++ of the hardlink utility, which recursively parses directory
 structures and creates hard links for identical files found.
 
-
 %prep
 %setup
 %patch0 -p1 -b .stdio
 %patch1 -p1 -b .sane-makefile
 %patch2 -p1 -b .gcc34-optimize-help
-
+%patch3 -b .cstdlib
 
 %build
 %{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
 
-
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -D -m 0755 hardlink++ %{buildroot}%{_bindir}/hardlink++
-
+%{__install} -Dp -m0755 hardlink++ %{buildroot}%{_bindir}/hardlink++
 
 %clean
 %{__rm} -rf %{buildroot}
-
 
 %files
 %defattr(-, root, root, 0755)
 %doc COPYING README
 %{_bindir}/hardlink++
-
 
 %changelog
 * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.02-3

Modified: trunk/rpms/kismet/kismet.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/kismet/kismet.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/kismet/kismet.spec (original)
+++ trunk/rpms/kismet/kismet.spec Wed Apr 13 01:34:33 2011
@@ -10,8 +10,8 @@
 Summary: 802.11 (wireless) network sniffer and network dissector
 Name: kismet
 Version: 3.0.1
-%define real_version 2010-07-R1
-Release: 201007r1.1%{?dist}
+%define real_version 2011-01-R1
+Release: 201101r1.1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.kismetwireless.net/
@@ -96,6 +96,9 @@
 %endif
 
 %changelog
+* Wed Jan 26 2011 Dag Wieers <dag at wieers.com> - 3.0.1-201101r1-1
+- Updated to release 2011-01-R1.
+
 * Thu Jul 15 2010 Dag Wieers <dag at wieers.com> - 3.0.1-201007r1-1
 - Updated to release 2010-07-R1.
 

Modified: trunk/rpms/lft/lft.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lft/lft.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/lft/lft.spec (original)
+++ trunk/rpms/lft/lft.spec Wed Apr 13 01:34:33 2011
@@ -1,7 +1,6 @@
 # $Id$
 # Authority: dag
 # Upstream: <lft$oppleman,com>
-
 
 %{!?dtag:%define _with_libpcapdevel 1}
 %{?el5:%define _with_libpcapdevel 1}
@@ -9,7 +8,7 @@
 
 Summary: Alternative traceroute tool for network (reverse) engineers
 Name: lft
-Version: 3.0
+Version: 3.31
 Release: 1%{?dist}
 License: MainNerve Public License
 Group: Applications/Internet
@@ -54,6 +53,9 @@
 %{_bindir}/lft
 
 %changelog
+* Wed Mar 09 2011 Dag Wieers <dag at wieers.com> - 3.31-1
+- Updated to release 3.31
+
 * Thu May 17 2007 Dag Wieers <dag at wieers.com> - 3.0-1
 - Updated to release 3.0.
 

Modified: trunk/rpms/lftp/lftp.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lftp/lftp.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/lftp/lftp.spec (original)
+++ trunk/rpms/lftp/lftp.spec Wed Apr 13 01:34:33 2011
@@ -15,7 +15,7 @@
 
 Summary: Sophisticated file transfer program
 Name: lftp
-Version: 4.1.1
+Version: 4.2.1
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
@@ -82,6 +82,12 @@
 %exclude %{_libdir}/liblftp-tasks.la
 
 %changelog
+* Fri Apr 01 2011 Dag Wieers <dag at wieers.com> - 4.2.1-1
+- Updated to release 4.2.1.
+
+* Thu Mar 31 2011 Dag Wieers <dag at wieers.com> - 4.2.0-1
+- Updated to release 4.2.0.
+
 * Fri Nov 26 2010 Dag Wieers <dag at wieers.com> - 4.1.1-1
 - Updated to release 4.1.1.
 

Modified: trunk/rpms/linphone/linphone.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/linphone/linphone.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/linphone/linphone.spec (original)
+++ trunk/rpms/linphone/linphone.spec Wed Apr 13 01:34:33 2011
@@ -13,20 +13,19 @@
 
 Summary: Software Internet phone using SIP
 Name: linphone
-Version: 1.0.0
+Version: 1.2.0
 Release: 1.2%{?dist}
 License: GPL
 Group: Applications/Communications
 URL: http://www.linphone.org/
 
-Source: http://simon.morlat.free.fr/download/%{version}/source/linphone-%{version}.tar.gz
+Source: http://simon.morlat.free.fr/download/1.2.x/source/linphone-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gettext, glib2-devel, libgnomeui-devel
 BuildRequires: libosip-devel, speex-devel, intltool, perl(XML::Parser)
 %{!?_without_alsa:BuildRequires: alsa-lib-devel}
 %{!?_without_gnome_applet:BuildRequires: gnome-panel-devel}
-Requires: /sbin/ldconfig
 
 %description
 Linphone is a web phone: it let you phone to your friends anywhere in
@@ -59,20 +58,17 @@
 
 %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
 desktop-file-install \
-	--delete-original                          \
-	--vendor %{desktop_vendor}                 \
-	--add-category X-Red-Hat-Base              \
-	--dir %{buildroot}%{_datadir}/applications \
-	%{buildroot}%{_datadir}/applications/linphone.desktop
+    --delete-original                          \
+    --vendor %{desktop_vendor}                 \
+    --add-category X-Red-Hat-Base              \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/linphone.desktop
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-/sbin/ldconfig 2>/dev/null
-
-%postun
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
@@ -101,8 +97,8 @@
 %{_libdir}/pkgconfig/linphone.pc
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.0.0-1.2
-- Rebuild for Fedora Core 5.
+* Sat Dec 24 2005 Dag Wieers <dag at wieers.com> - 1.2.0-1
+- Updated to release 1.2.0.
 
 * Wed Mar 23 2005 Dag Wieers <dag at wieers.com> - 1.0.0-1
 - Updated to release 1.0.0.

Modified: trunk/rpms/lksctp-tools/lksctp-tools.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lksctp-tools/lksctp-tools.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/lksctp-tools/lksctp-tools.spec (original)
+++ trunk/rpms/lksctp-tools/lksctp-tools.spec Wed Apr 13 01:34:33 2011
@@ -1,6 +1,8 @@
 # $Id$
 # Authority: shuff
 # Upstream: Sridhar Samudrala <sri$us,ibm,com>
+
+# ExclusiveDist: el4 el5
 
 ### EL6 ships with lksctp-tools-1.0.10-5.el6
 ### EL5 ships with lksctp-tools-1.0.6-3.el5
@@ -11,16 +13,19 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://lksctp.sourceforge.net
-Source0: http://downloads.sourceforge.net/project/lksctp/lksctp/%{name}-%{version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL: http://lksctp.sourceforge.net/
+
+Source: http://dl.sf.net/project/lksctp/lksctp/lksctp-tools-%{version}/lksctp-tools-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gcc
-BuildRequires: libtool, automake, autoconf
 BuildRequires: kernel-devel >= 2.5.36
-
+BuildRequires: libtool
 Requires: kernel >= 2.5.36
 
 %description
@@ -60,46 +65,59 @@
 - IETF RFC's & Internet Drafts
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup
 
 %build
 %configure --enable-shared --enable-static
-make
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR="$RPM_BUILD_ROOT"
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog COPYING.lib
-%{_bindir}/*
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING COPYING.lib
+%doc %{_mandir}/man7/sctp.7*
+%{_bindir}/checksctp
+%{_bindir}/sctp_darn
+%{_bindir}/sctp_status
+%{_bindir}/sctp_test
+%{_bindir}/withsctp
 %{_libdir}/libsctp.so.*
-%{_libdir}/lksctp-tools/*
+%dir %{_libdir}/lksctp-tools/
+%{_libdir}/lksctp-tools/*.so.*
+%exclude %{_libdir}/lksctp-tools/*.a
+%exclude %{_libdir}/lksctp-tools/*.la
 
 %files devel
-%defattr(-,root,root,-)
-%{_includedir}
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man3/sctp_*.3*
+%{_datadir}/lksctp-tools/
+%dir %{_includedir}/netinet/
+%{_includedir}/netinet/sctp.h
 %{_libdir}/libsctp.so
-%{_libdir}/libsctp.a
-%{_libdir}/libsctp.la
-%{_datadir}/lksctp-tools/*
-%{_mandir}/*
+%dir %{_libdir}/lksctp-tools/
+%{_libdir}/lksctp-tools/*.so*
+%exclude %{_libdir}/libsctp.a
+%exclude %{_libdir}/libsctp.la
 
 %files doc
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
 %doc doc/*.txt
 
 %changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 1.0.10-3
+- Remove .a and .la files.
+- Include directories.
+- Add man(7) to main package.
+
 * Mon Sep 28 2009 Steve Huff <shuff at vecna.org> - 1.0.10-2
 - some fixes for RPMforge standards compliance
 - updated to latest version

Modified: trunk/rpms/lsdvd/lsdvd.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lsdvd/lsdvd.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/lsdvd/lsdvd.spec (original)
+++ trunk/rpms/lsdvd/lsdvd.spec Wed Apr 13 01:34:33 2011
@@ -9,7 +9,7 @@
 Group: Applications/Multimedia
 URL: http://untrepid.com/lsdvd/
 Source: http://dl.sf.net/acidrip/lsdvd-%{version}.tar.gz
-Patch: lsdvd-0.16-build.patch
+Patch0: lsdvd-0.16-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake
 BuildRequires: libdvdread-devel
@@ -22,7 +22,7 @@
 
 %prep
 %setup
-%patch -p1 -b .build
+%patch0 -p1 -b .build
 %{__aclocal}
 %{__automake} --add-missing --copy --force --gnu --include-deps Makefile
 %{__autoconf}

Added: trunk/rpms/lyx/lyx-1.5.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lyx/lyx-1.5.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/lyx/lyx-1.5.spec (added)
+++ trunk/rpms/lyx/lyx-1.5.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,160 @@
+# $Id$
+# Authority: dag
+# Upstream: <lyx-devel$lists,lyx,org>
+
+
+%{?rh7:%define _without_freedesktop 1}
+%{?el2:%define _without_freedesktop 1}
+
+%define desktop_vendor rpmforge
+
+Summary: WYSIWYM (What You See Is What You Mean) frontend to LaTeX
+Name: lyx
+Version: 1.5.6
+Release: 1%{?dist}
+License: GPL
+Group: Applications/Publishing
+URL: http://www.lyx.org/
+
+Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source1: lyx-icon.png
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: qt4-devel, gcc-c++
+%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+Requires: qt4 >= 4.1.1, tetex-xdvi, tetex, tetex-latex
+Obsoletes: tetex-lyx
+
+%description
+LyX is a modern approach to writing documents which breaks with the
+obsolete "typewriter paradigm" of most other document preparation
+systems.
+
+It is designed for people who want professional quality output
+with a minimum of time and effort, without becoming specialists in
+typesetting.
+
+The major innovation in LyX is WYSIWYM (What You See Is What You Mean).
+That is, the author focuses on content, not on the details of formatting.
+This allows for greater productivity, and leaves the final typesetting
+to the backends (like LaTeX) that are specifically designed for the task.
+
+With LyX, the author can concentrate on the contents of his writing,
+and let the computer take care of the rest.
+
+
+%prep
+%setup
+
+%{__cat} <<EOF >lyx.desktop
+[Desktop Entry]
+Name=LyX LaTeX Frontend
+Comment=Write documents in a WYSIWYM way
+Exec=lyx
+Icon=lyx.png
+Type=Application
+Terminal=false
+Encoding=UTF-8
+Categories=Application;Office;
+EOF
+
+%build
+%configure \
+    --disable-assertions \
+    --disable-concept-checks \
+    --disable-debug \
+    --disable-dependency-tracking \
+    --disable-rpath \
+    --disable-stdlib-debug \
+    --enable-compression-support \
+    --enable-optimization="%{optflags}" \
+    --with-aiksaurus \
+    --with-aspell \
+    --with-frontend="qt4" \
+    --with-qt4-dir="%{_libdir}/qt4" \
+    --without-warnings
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
+
+### Set up the lyx-specific class files where TeX can see them
+%{__install} -d -m0755 %{buildroot}%{_datadir}/texmf/tex/latex/
+%{__mv} -f %{buildroot}%{_datadir}/lyx/tex %{buildroot}%{_datadir}/texmf/tex/latex/lyx
+
+### Miscellaneous files
+%{__install} -Dp -m0644 lib/images/lyx.xpm %{buildroot}%{_datadir}/lyx/images/lyx.xpm
+%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/lyx.png
+#%{__install} -p -m0644 lib/reLyX/README README.reLyX
+
+### Install desktop file and icon
+%if %{?_without_freedesktop:1}0
+        %{__install} -Dp -m0644 lyx.desktop %{buildroot}%{_datadir}/gnome/apps/Applications/
+%else
+        %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+        desktop-file-install --vendor %{desktop_vendor} \
+                --add-category X-Red-Hat-Extra          \
+                --dir %{buildroot}%{_datadir}/applications \
+                lyx.desktop
+%endif
+
+%post
+### Make TeX understand where LyX-specific packages are
+texhash &>/dev/null
+
+### Before configuring lyx for the local system PATH needs to be imported
+if [ -r /etc/profile ]; then
+    . /etc/profile
+fi
+
+### Now configure LyX
+cd %{_datadir}/lyx/
+%configure --srcdir &>/dev/null
+
+### Fix reLyX perl program if the prefix is non-standard
+%{__perl} -pi -e 's|/usr/share/lyx|%{_datadir}/lyx|' %{_bindir}/reLyX
+
+%postun
+### Fix the TeX file hash
+texhash &>/dev/null
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc ANNOUNCE ChangeLog COPYING NEWS README* UPGRADING
+%doc %{_mandir}/man?/*
+%{_bindir}/*
+%{_datadir}/lyx/
+%{_datadir}/pixmaps/lyx.png
+%{_datadir}/texmf/tex/latex/lyx/
+%{?_without_freedesktop:%{_datadir}/gnome/apps/Applications/lyx.desktop}
+%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-lyx.desktop}
+
+%changelog
+* Sat Nov 08 2008 Christoph Maser <cmr at financial.com> - 1.5.6-1
+- Updated to release 1.5.6.
+
+* Sat Aug 11 2007 Dag Wieers <dag at wieers.com> - 1.5.1-1
+- Updated to release 1.5.1.
+
+* Tue Sep 26 2006 Dries Verachtert <dries at ulyssis.org> - 1.4.1-1
+- Updated to release 1.4.1.
+
+* Fri Nov 05 2004 Dag Wieers <dag at wieers.com> - 1.3.5-1
+- Updated to release 1.3.5.
+
+* Thu Mar 18 2004 Bert de Bruijn <bert at debruijn.be> - 1.3.4-1
+- Added .desktop file and icon.
+
+* Thu Feb 19 2004 Dag Wieers <dag at wieers.com> - 1.3.4-0
+- Updated to release 1.3.4.
+
+* Sat Nov 22 2003 Dag Wieers <dag at wieers.com> - 1.3.3-0
+- Updated to release 1.3.3.
+
+* Sun May 11 2003 Dag Wieers <dag at wieers.com> - 1.3.2-0
+- Initial package. (using DAR)

Propchange: trunk/rpms/lyx/lyx-1.5.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/lyx/lyx-1.5.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/lyx/lyx.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/lyx/lyx.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/lyx/lyx.spec (original)
+++ trunk/rpms/lyx/lyx.spec Wed Apr 13 01:34:33 2011
@@ -1,7 +1,6 @@
 # $Id$
 # Authority: dag
 # Upstream: <lyx-devel$lists,lyx,org>
-
 
 %{?rh7:%define _without_freedesktop 1}
 %{?el2:%define _without_freedesktop 1}
@@ -10,19 +9,23 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: lyx
-Version: 1.5.6
+Version: 1.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://www.lyx.org/
 
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-%{version}.tar.bz2
 Source1: lyx-icon.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: qt4-devel, gcc-c++
+BuildRequires: gcc-c++
+BuildRequires: qt4-devel
 %{!?_without_freedesktop:BuildRequires: desktop-file-utils}
-Requires: qt4 >= 4.1.1, tetex-xdvi, tetex, tetex-latex
+Requires: qt4 >= 4.1.1
+Requires: tetex
+Requires: tetex-xdvi
+Requires: tetex-latex
 Obsoletes: tetex-lyx
 
 %description
@@ -41,7 +44,6 @@
 
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
-
 
 %prep
 %setup
@@ -135,6 +137,9 @@
 %{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-lyx.desktop}
 
 %changelog
+* Fri Nov 26 2010 Dag Wieers <dag at wieers.com> - 1.6.8-1
+- Updated to release 1.6.8.
+
 * Sat Nov 08 2008 Christoph Maser <cmr at financial.com> - 1.5.6-1
 - Updated to release 1.5.6.
 

Modified: trunk/rpms/monitorix/monitorix.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/monitorix/monitorix.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/monitorix/monitorix.spec (original)
+++ trunk/rpms/monitorix/monitorix.spec Wed Apr 13 01:34:33 2011
@@ -20,7 +20,7 @@
 Monitorix is a free, open source, lightweight system monitoring tool.
 
 %prep
-%setup -q
+%setup
 
 %build
 
@@ -129,6 +129,7 @@
 - Updated to 1.2.4
 * Mon Mar 30 2009 Fabian Arrotin <fabian.arrotin at arrfab.net> 1.2.3-1
 - Cosmetic changes for RPMforge inclusion
+
 * Thu Sep 01 2005 Jordi Sanfeliu <admin at fibranet.cat>
 - Release 0.7.8.
 - First public release.

Modified: trunk/rpms/mpeg4ip/mpeg4ip.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/mpeg4ip/mpeg4ip.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/mpeg4ip/mpeg4ip.spec (original)
+++ trunk/rpms/mpeg4ip/mpeg4ip.spec Wed Apr 13 01:34:33 2011
@@ -14,11 +14,23 @@
 Patch0: mpeg4ip-1.5.0.1-nowerror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: libtool, SDL-devel, gcc-c++
-BuildRequires: id3lib-devel, xvidcore-devel, a52dec-devel,libmad-devel
-BuildRequires: mpeg2dec-devel, libvorbis-devel, ffmpeg-devel, lame-devel
-BuildRequires: faac-devel, x264-devel, gtk2-devel, nasm
-BuildRequires: arts-devel, esound-devel
+BuildRequires: a52dec-devel
+BuildRequires: arts-devel
+BuildRequires: esound-devel
+BuildRequires: faac-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: gcc-c++
+BuildRequires: gtk2-devel
+BuildRequires: id3lib-devel
+BuildRequires: lame-devel
+BuildRequires: libmad-devel
+BuildRequires: libtool
+BuildRequires: libvorbis-devel
+BuildRequires: mpeg2dec-devel
+BuildRequires: nasm
+BuildRequires: SDL-devel
+BuildRequires: x264-devel
+BuildRequires: xvidcore-devel
 
 %description
 MPEG4IP provides an end-to-end system to explore streaming multimedia. The
@@ -39,6 +51,9 @@
 %prep
 %setup
 %patch0 -p1 -b .nowerror
+
+%{__perl} -pi.orig -e 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' configure* \
+    player/plugin/audio/ffmpeg/*.h server/mp4live/*
 
 %build
 sh bootstrap --disable-warns-as-err
@@ -64,7 +79,7 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING FEATURES.html README* TODO
-%{_mandir}/man1/*.1*
+%doc %{_mandir}/man1/*.1*
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/mp4player_plugin/

Modified: trunk/rpms/mpg123/mpg123.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/mpg123/mpg123.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/mpg123/mpg123.spec (original)
+++ trunk/rpms/mpg123/mpg123.spec Wed Apr 13 01:34:33 2011
@@ -21,8 +21,8 @@
 
 Summary: MPEG audio player
 Name: mpg123
-Version: 1.12.5
-Release: 2%{?dist}
+Version: 1.13.2
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Applications/Multimedia
 URL: http://mpg123.org/
@@ -93,9 +93,10 @@
 %exclude %{_libdir}/libmpg123.la
 
 %changelog
-* Thu Nov 18 2010 Dag Wieers <dag at wieers.com> - 
+* Wed Mar 09 2011 Dag Wieers <dag at wieers.com> - 1.13.2-1
 - Cleaned up doc/ directory.
 - Enabled esound dependency on EL6.
+- Updated to release 1.13.2.
 
 * Thu Oct 07 2010 Dag Wieers <dag at wieers.com> - 1.12.5-1
 - Updated to release 1.12.5.

Modified: trunk/rpms/mplayer/mplayer.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/mplayer/mplayer.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/mplayer/mplayer.spec (original)
+++ trunk/rpms/mplayer/mplayer.spec Wed Apr 13 01:34:33 2011
@@ -6,7 +6,6 @@
 %define desktop_vendor rpmforge
 
 %define _without_directfb 1
-%define _without_faad2 1
 %define _without_ivtv 1
 %define _without_jack 1
 %define _without_live 1
@@ -17,26 +16,37 @@
 %define _without_xmms 1
 %define _without_xss 1
 
+### Use internal/ffmpeg libraries
+%define _without_dvdnav 1
+%define _without_dvdread 1
+%define _without_faac 1
+%define _without_faad2 1
+
 %{?el6:%define _without_lirc 1}
 
+### Disable internal ASS for RHEL5 (and older) as it requires fontconfig >= 2.4.2 :-/
+%{?el5:%define _without_ass 1}
+%{?el5:%define _without_internal_ass 1}
 %{?el5:%define _without_pulseaudio 1}
 %{?el5:%define _without_schroedinger 1}
 %{?el5:%define _without_speex 1}
-%{?el5:%define _without_vpx 1}
-
+
+%{?el4:%define _without_ass 1}
 %{?el4:%define _without_giflib 1}
+%{?el4:%define _without_internal_ass 1}
 %{?el4:%define _without_modxorg 1}
 %{?el4:%define _without_pulseaudio 1}
 %{?el4:%define _without_sdl 1}
 %{?el4:%define _without_samba 1}
 %{?el4:%define _without_speex 1}
-%{?el4:%define _without_vpx 1}
-
+
+%{?el3:%define _without_ass 1}
 %{?el3:%define _without_alsa 1}
 %{?el3:%define _without_binutils214 1}
 %{?el3:%define _without_fribidi 1}
 %{?el3:%define _without_giflib 1}
-#{?el3:#define _without_h264 1}
+%{?el3:%define _without_hicolortheme 1}
+%{?el3:%define _without_internal_ass 1}
 %{?el3:%define _without_modxorg 1}
 %{?el3:%define _without_pulseaudio 1}
 %{?el3:%define _without_samba 1}
@@ -45,27 +55,20 @@
 %{?el3:%define _without_speex 1}
 %{?el3:%define _without_theora 1}
 %{?el3:%define _without_v4l2 1}
-%{?el3:%define _without_vpx 1}
-%{?el3:%define _without_x264_patch 1}
 %{?el3:%define _without_xvmc 1}
 
 %define real_name MPlayer
-%define real_version rc3
-%define live_version 2009.07.09
 
 Summary: MPlayer, the Movie Player for Linux
 Name: mplayer
 Version: 1.0
 %define real_version 2010-07-03
-Release: 0.45.svn20100703%{?dist}
+Release: 0.46.svn20100703%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://mplayerhq.hu/
 
-#Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{real_version}.tar.bz2
-#Source0: http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2
 Source0: http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-%{real_version}.tar.bz2
-#Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{real_version}.tar.bz2
 Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10: mplayer-snapshot.sh
 Patch0: MPlayer-0.90pre9-runtimemsg.patch
@@ -73,12 +76,11 @@
 Patch8: mplayer-manlinks.patch
 Patch10: MPlayer-1.0pre6a-fribidi.patch
 Patch14: mplayer-nodvdcss.patch
-#Patch100: mplayer-1.0rc1-h264-static.patch
+Patch100: mplayer-1.0rc1-h264-static.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: desktop-file-utils
 BuildRequires: flac-devel
-BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0.9
 BuildRequires: gcc-c++
 BuildRequires: ImageMagick
@@ -95,18 +97,20 @@
 %{!?_without_alsa:BuildRequires: alsa-lib-devel}
 %{!?_without_amr:BuildRequires: opencore-amr-devel}
 %{!?_without_arts:BuildRequires: arts-devel}
+%{!?_without_ass:BuildRequires: libass-devel, freetype-devel >= 2.1.0}
 %{!?_without_caca:BuildRequires: libcaca-devel}
 %{!?_without_cdparanoia:BuildRequires: cdparanoia-devel}
 %{!?_without_directfb:BuildRequires: directfb-devel >= 1.0.1}
 %{!?_without_dts:BuildRequires: libdca-devel}
 %{!?_without_dv:BuildRequires: libdv-devel}
-%{?_with_dvdread:BuildRequires: libdvdread-devel}
-%{?_with_dvdnav:BuildRequires: libdvdnav-devel >= 4.1.3-1}
+%{!?_without_dvdnav:BuildRequires: libdvdnav-devel >= 4.1.3-1}
+%{!?_without_dvdread:BuildRequires: libdvdread-devel}
 %{!?_without_enca:BuildRequires: enca-devel}
 %{!?_without_esound:BuildRequires: esound-devel}
 %{!?_without_faac:BuildRequires: faac-devel}
 %{!?_without_faad2:BuildRequires: faad2-devel >= 1:2.6.1}
 %{!?_without_fame:BuildRequires: libfame-devel}
+%{!?_without_fontconfig:BuildRequires: fontconfig-devel}
 %{!?_without_fribidi:BuildRequires: fribidi-devel}
 %{!?_without_giflib:BuildRequires: giflib-devel}
 %{?_without_giflib:BuildRequires: libungif-devel}
@@ -128,15 +132,13 @@
 %{!?_without_pulseaudio:BuildRequires: pulseaudio-lib-devel}
 %{!?_without_samba:BuildRequires: samba-common, libsmbclient-devel}
 %{!?_without_schroedinger:BuildRequires: schroedinger-devel}
+%{!?_without_sdl:BuildRequires: SDL-devel}
 %{!?_without_speex:BuildRequires: speex-devel >= 1.1}
-%{!?_without_sdl:BuildRequires: SDL-devel}
 %{!?_without_svgalib:BuildRequires: svgalib-devel}
 %{!?_without_theora:BuildRequires: libtheora-devel}
 %{!?_without_twolame:BuildRequires: twolame-devel}
 %{!?_without_vdpau:BuildRequires: libvdpau-devel}
 %{!?_without_vorbis:BuildRequires: libvorbis-devel}
-#%{!?_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
-%{!?_without_vpx:BuildRequires: libvpx-devel}
 %{!?_without_vstream:BuildRequires: vstream-client-devel}
 %{!?_without_x264:BuildRequires: x264-devel}
 %{!?_without_xmms:BuildRequires: xmms-devel}
@@ -181,7 +183,7 @@
 Summary: GUI for MPlayer
 Group: Applications/Multimedia
 Requires: mplayer-common = %{version}-%{release}
-Requires: hicolor-icon-theme
+%{!?_without_hicolortheme:Requires: hicolor-icon-theme}
 
 %description gui
 This package contains a GUI for MPlayer and a default skin for it.
@@ -216,6 +218,7 @@
 #patch100 -p0 -b .h264_static
 
 %build
+export LDFLAGS="%{!?_without_fontconfig:$(pkg-config --libs fontconfig)} %{!?_without_fribidi:$(pkg-config --libs fribidi)}"
 export CFLAGS="%{optflags} -fomit-frame-pointer"
 echo | ./configure \
     --prefix="%{_prefix}" \
@@ -226,37 +229,40 @@
     --mandir="%{_mandir}" \
     --codecsdir="%{_libdir}/codecs" \
     --extra-cflags="%{optflags}%{!?_without_live: -I/usr/include/liveMedia}" \
+%{?_without_binutils214:--disable-ssse3} \
     --disable-bitmap-font \
+%{?_without_gcccheck:--disable-gcc-check} \
+%{?_without_internal_ass:--disable-ass-internal} \
+%{?_without_sdl:--disable-sdl} \
     --disable-termcap \
-%{?_without_arts:--disable-arts} \
-%{?_without_esound:--disable-esd} \
-%{?_without_jack:--disable-jack} \
-%{?_without_openal:--disable-openal} \
-%{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \
-%{!?_with_dvdread:--disable-dvdread} \
-%{?_without_faac:--disable-faac} \
-%{?_without_gcccheck:--disable-gcc-check} \
-%{?_without_binutils214:--disable-ssse3} \
+%{!?_without_amr:--enable-libopencore_amrnb --enable-libopencore_amrwb} \
+%{!?_without_arts:--enable-arts} \
+%{!?_without_ass:--enable-ass} \
 %{!?_without_directfb:--enable-directfb} \
-%{?_without_directfb:--disable-directfb} \
-%{?_without_sdl:--disable-sdl} \
-%{?_without_svgalib:--disable-svga} \
+%{!?_without_dvdread:--enable-dvdread} \
     --enable-dynamic-plugins \
+%{!?_without_esound:--enable-esd} \
+%{!?_without_faac:--enable-faac} \
     --enable-fbdev \
-%{!?_without_fribidi:--enable-fribidi --extra-libs="$(pkg-config --libs fribidi)"} \
+%{!?_without_fontconfig:--enable-fontconfig} \
+%{!?_without_fribidi:--enable-fribidi} \
     --enable-gui \
 %{!?_without_ivtv:--enable-ivtv} \
+%{!?_without_jack:--enable-jack} \
     --enable-joystick \
     --enable-largefiles \
 %{!?_without_lirc:--enable-lirc} \
 %{!?_without_live:--enable-live} \
+%{!?_without_openal:--enable-openal} \
 %{!?_without_osdmenu:--enable-menu} \
 %{!?_without_musepack:--enable-musepack} \
-%{?_without_nemesi:--disable-nemesi} \
+%{!?_without_nemesi:--enable-nemesi} \
     --enable-radio \
     --enable-radio-capture \
     --enable-runtime-cpudetection \
-%{?_without_samba:--disable-smb} \
+%{!?_without_samba:--enable-smb} \
+%{!?_without_sdl:--enable-sdl} \
+%{!?_without_svgalib:--enable-svga} \
     --enable-tv-v4l1 \
 %{!?_without_v4l2:--enable-tv-v4l2} \
     --enable-unrarexec \
@@ -314,12 +320,14 @@
     etc/mplayer.desktop
 
 %post gui
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+/usr/bin/update-desktop-database -q %{_datadir}/applications &>/dev/null || :
+/usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun gui
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+/usr/bin/update-desktop-database -q %{_datadir}/applications &>/dev/null || :
+/usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &> /dev/null || :
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -400,6 +408,9 @@
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Tue Dec 07 2010 Dag Wieers <dag at wieers.com> - 1.0-0.46.svn20100703
+- Fix issue with fontconfig on RHEL5, RHEL4 and RHEL3.
+
 * Mon Dec 06 2010 Dag Wieers <dag at wieers.com> - 1.0-0.45.svn20100703
 - Rebuild against libmatroska-1.0.0.
 

Modified: trunk/rpms/mrtg/mrtg.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/mrtg/mrtg.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/mrtg/mrtg.spec (original)
+++ trunk/rpms/mrtg/mrtg.spec Wed Apr 13 01:34:33 2011
@@ -17,8 +17,8 @@
 
 Summary: Multi Router Traffic Grapher
 Name: mrtg
-Version: 2.16.4
-Release: 2%{?dist}
+Version: 2.17.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://oss.oetiker.ch/mrtg/
@@ -155,6 +155,9 @@
 %{_libdir}/mrtg2/
 
 %changelog
+* Sat Feb 19 2011 Dag Wieers <dag at wieers.com> - 2.17.1-1
+- Updated to release 2.17.1.
+
 * Sun Jul 11 2010 Nico Kadel-Garcia <nkadel at gmail.com> 2.16.4-2
 - Restore and update lib64 patch from 2.12.1 SRPM
   Uses @@lib@@ instead of lib in FindBin statements for lib64 systems.

Modified: trunk/rpms/ms-sys/ms-sys.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/ms-sys/ms-sys.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/ms-sys/ms-sys.spec (original)
+++ trunk/rpms/ms-sys/ms-sys.spec Wed Apr 13 01:34:33 2011
@@ -4,7 +4,7 @@
 
 Summary: Create DOS/MS-compatible boot records
 Name: ms-sys
-Version: 2.2.0
+Version: 2.2.1
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -48,6 +48,9 @@
 %{_bindir}/ms-sys
 
 %changelog
+* Wed Jan 26 2011 Dag Wieers <dag at wieers.com> - 2.2.1-1
+- Updated to release 2.2.1.
+
 * Fri May 14 2010 Dag Wieers <dag at wieers.com> - 2.2.0-1
 - Updated to release 2.2.0.
 

Added: trunk/rpms/pasco/pasco.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pasco/pasco.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pasco/pasco.spec (added)
+++ trunk/rpms/pasco/pasco.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,44 @@
+# $Id$
+# Authority: dag
+
+Summary: pasco
+Name: pasco
+Version: 1.0
+Release: 1%{?dist}
+License: GPL
+Group: Applications/File
+URL: http://www.foundstone.com/us/resources/proddesc/pasco.htm
+
+Source: pasco-1.0.tar.gz
+BuildRoot: %{_tmppath}/root-%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++
+BuildRequires: libstdc++-devel
+
+%description
+Pasco will parse the information in an index.dat file and output the
+results in a field delimited manner so that it may be imported into
+your favorite spreadsheet program. Pasco is built to work on multiple
+platforms and will execute on Windows (through Cygwin), Mac OS X, Linux,
+and *BSD platforms.
+
+%prep
+%setup -n %{name}
+
+%build
+%{__make} -C src %{?_smp_mflags}
+
+%install
+%{__install} -Dp -m755 src/pasco %{buildroot}%{_bindir}/pasco
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc Readme.txt
+%{_bindir}/pasco
+
+%changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 1.0-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/pasco/pasco.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/pasco/pasco.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/pcsc-lite-acr38u/pcsc-lite-acr38u.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pcsc-lite-acr38u/pcsc-lite-acr38u.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/pcsc-lite-acr38u/pcsc-lite-acr38u.spec (original)
+++ trunk/rpms/pcsc-lite-acr38u/pcsc-lite-acr38u.spec Wed Apr 13 01:34:33 2011
@@ -3,18 +3,19 @@
 
 %define usbdropdir %(pkg-config libpcsclite --variable="usbdropdir" 2>/dev/null)
 
-Summary: ACS ACR 38 USB (acr38u) Smartcard Reader driver for PCSC-lite
+Summary: ACS ACR 38 USB (acr38u non-CCID) Smartcard Reader driver for PCSC-lite
 Name: pcsc-lite-acr38u
-%define real_version 100709
-Version: 1.7.9
-Release: 2%{?dist}
+%define real_version 1710
+Version: 1.7.10
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Kernel
 URL: http://www.acs.com.hk/acr38_driversmanual.asp
 
-Source: http://www.acs.com.hk/download/ACR38_LINUX_%{real_version}_P.tar.gz
+Source: http://www.acs.com.hk/drivers/eng/ACR38U_driver_Lnx_%{real_version}_P.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires: libusb-devel
 BuildRequires: pcsc-lite-devel >= 1.3.1
 Requires: pcsc-lite >= 1.3.1
 
@@ -23,7 +24,7 @@
 Obsoletes: acr38u <= %{version}-%{release}
 
 %description
-CCID ACR38u Smart Card reader driver for PCSC-lite.
+Non-CCID ACR38u Smart Card reader driver for PCSC-lite.
 
 %package devel
 Summary: Header files, libraries and development documentation for %{name}.
@@ -36,13 +37,12 @@
 you will need to install %{name}-devel.
 
 %prep
-%setup -n ACR38_LINUX_%{real_version}_P
+%setup -n ACR38_LINUX_100710_P
 
 %build
 %configure \
-	--disable-dependency-tracking \
-	--disable-static \
-	--enable-usbdropdir="%{buildroot}%{usbdropdir}"
+    --disable-static \
+    --enable-usbdropdir="%{buildroot}%{usbdropdir}"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -51,13 +51,15 @@
 
 %post
 /sbin/ldconfig
-if [ $1 -eq 1 ]; then
-	%{_initrddir}/pcscd try-restart &>/dev/null || :
+if /sbin/service pcscd status &>/dev/null; then
+    %{_sbindir}/pcscd -H &>/dev/null || :
 fi
 
 %postun
 /sbin/ldconfig
-%{_initrddir}/pcscd try-restart &>/dev/null || :
+if /sbin/service pcscd status &>/dev/null; then
+    %{_sbindir}/pcscd -H &>/dev/null || :
+fi
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -73,11 +75,15 @@
 %defattr(-, root, root, 0755)
 %doc doc/*
 %{_includedir}/ACS38DrvTools.h
-%exclude %{_libdir}/libacr38ucontrol.la
 %{_libdir}/libacr38ucontrol.so
 %{_prefix}/lib/pkgconfig/libacr38ucontrol.pc
+%exclude %{_libdir}/libacr38ucontrol.la
 
 %changelog
+* Thu Feb 24 2011 Dag Wieers <dag at wieers.com> - 1.7.10-1
+- Updated to release 1.7.10.
+- Make pcscd rescan the USB buses.
+
 * Fri Feb 09 2007 Dag Wieers <dag at wieers.com> - 1.7.9-2
 - Added missing so symlink.
 - Run ldconfig in %%post and %%postun.

Added: trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec (added)
+++ trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,54 @@
+# $Id$
+# Authority: dag
+# Upstream: Johan Vromans <jv$cpan,org>
+
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+%define real_name Data-Hexify
+
+Summary: Perl extension for hexdumping arbitrary data
+Name: perl-Data-Hexify
+Version: 1.00
+Release: 1%{?dist}
+License: Artistic/GPL
+Group: Applications/CPAN
+URL: http://search.cpan.org/dist/Data-Hexify/
+
+Source: http://www.cpan.org/modules/by-module/Data/Data-Hexify-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: perl
+
+%description
+Perl extension for hexdumping arbitrary data.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} pure_install
+
+### Clean up buildroot
+find %{buildroot} -name .packlist -exec %{__rm} {} \;
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc Changes MANIFEST META.yml README
+%doc %{_mandir}/man3/Data::Hexify.3pm*
+%dir %{perl_vendorlib}/Data/
+#%{perl_vendorlib}/Data/Hexify/
+%{perl_vendorlib}/Data/Hexify.pm
+
+%changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 1.00-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/perl-Data-Hexify/perl-Data-Hexify.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Added: trunk/rpms/perl-File-Mork/perl-File-Mork.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/perl-File-Mork/perl-File-Mork.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/perl-File-Mork/perl-File-Mork.spec (added)
+++ trunk/rpms/perl-File-Mork/perl-File-Mork.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,71 @@
+# $Id$
+# Authority: dag
+# Upstream: Simon Wistow <simonw$cpan,org>
+
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+%define real_name File-Mork
+
+Summary: Perl module to read Mozilla URL history files
+Name: perl-File-Mork
+Version: 0.3
+Release: 1%{?dist}
+License: Artistic/GPL
+Group: Applications/CPAN
+URL: http://search.cpan.org/dist/File-Mork/
+
+Source: http://www.cpan.org/modules/by-module/File/File-Mork-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: perl
+
+%description
+perl-File-Mork is a Perl module to read Mozilla URL history files.
+
+%package -n mork
+Summary: Tool for dumping Mozilla URL history files
+Group: Applications/File
+
+Requires: %{name} = %{version}-%{release}
+
+%description -n mork
+mork is a tool for dumping Mozilla URL history files.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} pure_install
+
+### Clean up buildroot
+find %{buildroot} -name .packlist -exec %{__rm} {} \;
+
+### Clean up docs
+find examples/ -type f -exec %{__chmod} a-x {} \;
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc Changes MANIFEST MANIFEST.SKIP META.yml examples/
+%doc %{_mandir}/man3/File::Mork.3pm*
+%dir %{perl_vendorlib}/File/
+#%{perl_vendorlib}/File/Mork/
+%{perl_vendorlib}/File/Mork.pm
+
+%files -n mork
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man1/mork.1*
+%{_bindir}/mork
+
+%changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 0.3-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/perl-File-Mork/perl-File-Mork.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/perl-File-Mork/perl-File-Mork.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/perl-MooseX-Params-Validate/perl-MooseX-Params-Validate.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/perl-MooseX-Params-Validate/perl-MooseX-Params-Validate.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/perl-MooseX-Params-Validate/perl-MooseX-Params-Validate.spec (original)
+++ trunk/rpms/perl-MooseX-Params-Validate/perl-MooseX-Params-Validate.spec Wed Apr 13 01:34:33 2011
@@ -10,7 +10,7 @@
 Summary: an extension of Params::Validate for using Moose's types
 Name: perl-MooseX-Params-Validate
 Version: 0.16
-Release: 1
+Release: 1%{?dist}
 License: Artistic/GPL
 Group: Applications/CPAN
 URL: http://search.cpan.org/dist/MooseX-Params-Validate/

Added: trunk/rpms/pptp/pptp-1.7.2-compat.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-compat.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-compat.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-compat.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,71 @@
+Index: pptp_compat.c
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
+retrieving revision 1.1
+retrieving revision 1.3
+diff -u -r1.1 -r1.3
+--- pptp_compat.c	19 Feb 2008 21:43:28 -0000	1.1
++++ pptp_compat.c	25 Jul 2008 00:13:56 -0000	1.3
+@@ -7,14 +7,15 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <stropts.h>
+ #include <stdlib.h>
++#if defined (__SVR4) && defined (__sun) /* Solaris */
++#include <stropts.h>
++#endif
+ #include <strings.h>
+ #include "pptp_compat.h"
+ #include <stdio.h>
+ #include "util.h"
+ 
+-
+ #if defined (__SVR4) && defined (__sun) /* Solaris */
+ /*
+  * daemon implementation from uClibc
+Index: pptp.c
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
+retrieving revision 1.49
+retrieving revision 1.51
+diff -u -r1.49 -r1.51
+--- pptp.c	14 May 2008 06:32:52 -0000	1.49
++++ pptp.c	24 Jul 2008 05:53:05 -0000	1.51
+@@ -61,9 +61,8 @@
+ #include "version.h"
+ #if defined(__linux__)
+ #include <sys/prctl.h>
+-#else
+-#include "inststr.h"
+ #endif
++#include "inststr.h"
+ #include "util.h"
+ #include "pptp_quirks.h"
+ #include "pqueue.h"
+@@ -129,7 +128,7 @@
+ }
+ 
+ #if defined (__SVR4) && defined (__sun)
+-struct in_addr localbind = { INADDR_ANY };
++struct in_addr localbind = { .s_addr = INADDR_ANY };
+ #else
+ struct in_addr localbind = { INADDR_NONE };
+ #endif
+@@ -183,6 +182,7 @@
+     struct in_addr inetaddr;
+     volatile int callmgr_sock = -1;
+     char ttydev[PATH_MAX];
++    char *tty_name;
+     int pty_fd, tty_fd, gre_fd, rc;
+     volatile pid_t parent_pid, child_pid;
+     u_int16_t call_id, peer_call_id;
+@@ -391,7 +391,7 @@
+         file2fd("/dev/null", "wb", STDERR_FILENO);
+     }
+ 
+-    char *tty_name = ttyname(tty_fd);
++    tty_name = ttyname(tty_fd);
+     snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
+               tty_name ? tty_name : "(null)");
+ #ifdef PR_SET_NAME

Added: trunk/rpms/pptp/pptp-1.7.2-ip-path.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-ip-path.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-ip-path.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-ip-path.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,186 @@
+Index: routing.c
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v
+retrieving revision 1.1
+diff -u -r1.1 routing.c
+--- routing.c	2 Aug 2006 07:07:37 -0000	1.1
++++ routing.c	25 Mar 2009 13:58:28 -0000
+@@ -23,9 +23,26 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "routing.h"
++#include "config.h"
+ 
++#if defined (__SVR4) && defined (__sun) /* Solaris */
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <net/if.h>
++#include <arpa/inet.h>
++#include <errno.h>
++#include "util.h"
++/* PF_ROUTE socket*/
++int rts; 
++/* Destination and gateway addresses */
++struct sockaddr_in rdst, rgw;
++/* Request sequence */
++int rseq;
++int dorouting;
++#else /* Solaris */
+ /* route to the server */
+ char *route;
++#endif /* Solaris */
+ 
+ /*
+ 
+@@ -54,26 +71,113 @@
+ */
+ 
+ void routing_init(char *ip) {
++#if defined (__SVR4) && defined (__sun) /* Solaris */
++  rdst.sin_family = AF_INET;
++  if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) {
++    log("Cannot convert address: %s", strerror(errno));
++    return;
++  }
++
++  if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) {
++    log("Cannot open routing socket: %s", strerror(errno));
++    return;
++  }
++
++  struct rt_msg rtm = {
++    .hdr.rtm_msglen = sizeof(struct rt_msg),
++    .hdr.rtm_version = RTM_VERSION,
++    .hdr.rtm_type = RTM_GET,
++    .hdr.rtm_addrs = RTA_DST,
++    .hdr.rtm_pid = getpid(),
++    .hdr.rtm_seq = ++rseq,
++    .addrs[RTAX_DST] = rdst
++  };
++
++  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
++    log("Error writing to routing socket: %s", strerror(errno));
++    close(rts);
++    return;
++  }
++
++  while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 )
++    if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) {
++      /* Check if host route already present */
++      if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) {
++        rgw = rtm.addrs[RTAX_GATEWAY];
++        dorouting = 1;
++      }
++      break;
++    }
++#else /* Solaris */ 
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route get %s", ip);
+-  FILE *p = popen(buf, "r");
++  FILE *p;
++
++  snprintf(buf, 255, "%s route get %s", IP_BINARY, ip);
++  p = popen(buf, "r");
+   fgets(buf, 255, p);
+   /* TODO: check for failure of fgets */
+   route = strdup(buf);
+   pclose(p);
+   /* TODO: check for failure of command */
++#endif /* Solaris */
+ }
+ 
+ void routing_start() {
++#if defined (__SVR4) && defined (__sun) /* Solaris */
++  if ( ! dorouting )
++     return;
++
++  struct rt_msg rtm = {
++    .hdr.rtm_msglen = sizeof(struct rt_msg),
++    .hdr.rtm_version = RTM_VERSION,
++    .hdr.rtm_type = RTM_ADD,
++    .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
++    .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
++    .hdr.rtm_pid = getpid(),
++    .hdr.rtm_seq = ++rseq,
++    .addrs[RTAX_DST] = rdst,
++    .addrs[RTAX_GATEWAY] = rgw
++  };
++
++  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
++    log("Error adding route: %s", strerror(errno));
++  }
++#else /* Solaris */
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route replace %s", route);
+-  FILE *p = popen(buf, "r");
++  FILE *p;
++
++  snprintf(buf, 255, "%s route replace %s", IP_BINARY, route);
++  p = popen(buf, "r");
+   pclose(p);
++#endif /* Solaris */
+ }
+ 
+ void routing_end() {
++#if defined (__SVR4) && defined (__sun) /* Solaris */
++  if ( ! dorouting)
++    return;
++
++  struct rt_msg rtm = {
++    .hdr.rtm_msglen = sizeof(struct rt_msg),
++    .hdr.rtm_version = RTM_VERSION,
++    .hdr.rtm_type = RTM_DELETE,
++    .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
++    .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
++    .hdr.rtm_pid = getpid(),
++    .hdr.rtm_seq = ++rseq,
++    .addrs[RTAX_DST] = rdst,
++    .addrs[RTAX_GATEWAY] = rgw
++  };
++
++  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
++    log("Error deleting route: %s", strerror(errno));
++  }
++#else /* Solaris */
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route delete %s", route);
+-  FILE *p = popen(buf, "r");
++  FILE *p;
++
++  snprintf(buf, 255, "%s route delete %s", IP_BINARY, route);
++  p = popen(buf, "r");
+   pclose(p);
++#endif /* Solaris */
+ }
+Index: Makefile
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
+retrieving revision 1.47
+retrieving revision 1.49
+diff -u -r1.47 -r1.49
+--- Makefile	14 May 2008 06:32:52 -0000	1.47
++++ Makefile	24 Jul 2008 05:37:47 -0000	1.49
+@@ -1,10 +1,13 @@
+-# $Id: Makefile,v 1.47 2008/05/14 06:32:52 quozl Exp $
++# $Id: Makefile,v 1.49 2008/07/24 05:37:47 quozl Exp $
+ VERSION=1.7.2
+ RELEASE=
+ 
+ #################################################################
+-# CHANGE THIS LINE to point to the location of your pppd binary.
++# CHANGE THIS LINE to point to the location of binaries
+ PPPD = /usr/sbin/pppd
++# Solaris
++# PPPD = /usr/bin/pppd
++IP = /bin/ip
+ #################################################################
+ 
+ BINDIR=$(DESTDIR)/usr/sbin
+@@ -47,6 +52,7 @@
+ 	echo "/* text added by Makefile target config.h */" > config.h
+ 	echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
+ 	echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h
++	echo "#define IP_BINARY \"$(IP)\"" >> config.h
+ 
+ vector_test: vector_test.o vector.o
+ 	$(CC) -o vector_test vector_test.o vector.o

Added: trunk/rpms/pptp/pptp-1.7.2-makedeps.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-makedeps.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-makedeps.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-makedeps.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,80 @@
+Index: Makefile
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
+retrieving revision 1.47
+retrieving revision 1.49
+diff -u -r1.47 -r1.49
+--- Makefile	14 May 2008 06:32:52 -0000	1.47
++++ Makefile	24 Jul 2008 05:37:47 -0000	1.49
+@@ -96,3 +102,71 @@
+ release:
+ 	cp pptp_$(VERSION)-0_i386.deb $(WEB)
+ 	cd $(WEB);make
++
++# The following include file dependencies were generated using
++# "makedepend -w0 *.c", then manually removing out of tree entries.
++# DO NOT DELETE
++
++dirutil.o: dirutil.h
++orckit_quirks.o: pptp_msg.h
++orckit_quirks.o: pptp_compat.h
++orckit_quirks.o: pptp_options.h
++orckit_quirks.o: pptp_ctrl.h
++orckit_quirks.o: util.h
++ppp_fcs.o: ppp_fcs.h
++ppp_fcs.o: pptp_compat.h
++pptp.o: config.h
++pptp.o: pptp_callmgr.h
++pptp.o: pptp_gre.h
++pptp.o: pptp_compat.h
++pptp.o: version.h
++pptp.o: inststr.h
++pptp.o: util.h
++pptp.o: pptp_quirks.h
++pptp.o: pptp_msg.h
++pptp.o: pptp_ctrl.h
++pptp.o: pqueue.h
++pptp.o: pptp_options.h
++pptp_callmgr.o: pptp_callmgr.h
++pptp_callmgr.o: pptp_ctrl.h
++pptp_callmgr.o: pptp_compat.h
++pptp_callmgr.o: pptp_msg.h
++pptp_callmgr.o: dirutil.h
++pptp_callmgr.o: vector.h
++pptp_callmgr.o: util.h
++pptp_callmgr.o: routing.h
++pptp_compat.o: pptp_compat.h
++pptp_compat.o: util.h
++pptp_ctrl.o: pptp_msg.h
++pptp_ctrl.o: pptp_compat.h
++pptp_ctrl.o: pptp_ctrl.h
++pptp_ctrl.o: pptp_options.h
++pptp_ctrl.o: vector.h
++pptp_ctrl.o: util.h
++pptp_ctrl.o: pptp_quirks.h
++pptp_gre.o: ppp_fcs.h
++pptp_gre.o: pptp_compat.h
++pptp_gre.o: pptp_msg.h
++pptp_gre.o: pptp_gre.h
++pptp_gre.o: util.h
++pptp_gre.o: pqueue.h
++pptp_gre.o: test.h
++pptp_quirks.o: orckit_quirks.h
++pptp_quirks.o: pptp_options.h
++pptp_quirks.o: pptp_ctrl.h
++pptp_quirks.o: pptp_compat.h
++pptp_quirks.o: pptp_msg.h
++pptp_quirks.o: pptp_quirks.h
++pqueue.o: util.h
++pqueue.o: pqueue.h
++routing.o: routing.h
++test.o: util.h
++test.o: test.h
++util.o: util.h
++vector.o: pptp_ctrl.h
++vector.o: pptp_compat.h
++vector.o: vector.h
++vector_test.o: vector.h
++vector_test.o: pptp_ctrl.h
++vector_test.o: pptp_compat.h
++version.o: config.h

Added: trunk/rpms/pptp/pptp-1.7.2-pptpsetup-encrypt.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-pptpsetup-encrypt.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-pptpsetup-encrypt.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-pptpsetup-encrypt.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,22 @@
+--- pptpsetup	2009-06-01 14:30:36.000000000 +0100
++++ pptpsetup	2009-06-01 14:36:39.000000000 +0100
+@@ -43,12 +43,13 @@
+ sub create {
+     my $TUNNEL = shift;
+ 
+-    # system checking
+-    &Check_MPPE_in_kernel
+-        or die "$0: couldn't find MPPE support in kernel.\n";
+-
+-    &Check_MPPE_in_pppd
+-        or die "$0: couldn't find MPPE support in pppd.\n";
++    # if encryption is requested, check for support in kernel and pppd
++    if ( $ENCRYPT ) {
++        &Check_MPPE_in_kernel
++            or die "$0: couldn't find MPPE support in kernel.\n";
++        &Check_MPPE_in_pppd
++            or die "$0: couldn't find MPPE support in pppd.\n";
++    }
+ 
+     # input validation
+     ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}

Added: trunk/rpms/pptp/pptp-1.7.2-pptpsetup-mppe.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-pptpsetup-mppe.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-pptpsetup-mppe.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-pptpsetup-mppe.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,47 @@
+--- pptp-1.7.2/pptpsetup	2009-06-01 15:18:25.000000000 +0100
++++ pptp-1.7.2/pptpsetup	2009-06-01 15:19:25.000000000 +0100
+@@ -43,14 +43,6 @@
+ sub create {
+     my $TUNNEL = shift;
+ 
+-    # if encryption is requested, check for support in kernel and pppd
+-    if ( $ENCRYPT ) {
+-        &Check_MPPE_in_kernel
+-            or die "$0: couldn't find MPPE support in kernel.\n";
+-        &Check_MPPE_in_pppd
+-            or die "$0: couldn't find MPPE support in pppd.\n";
+-    }
+-
+     # input validation
+     ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}
+       or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n";
+@@ -180,29 +172,6 @@
+     exit;
+ }
+ 
+-### AUXILIAR SUBS ###
+-
+-sub Check_MPPE_in_kernel {
+-    my $command = q/modprobe ppp-compress-18/;
+-    if (system( $command ) == 0) {
+-        # no error!
+-        return 1;
+-    } else {
+-        return 0;
+-    }
+-}
+-
+-sub Check_MPPE_in_pppd {
+-    my $command = q/strings `which pppd`|grep -i mppe|wc --lines/;
+-    my $answer  = `$command`;
+-    if ($answer > 0) {
+-        # ok!
+-        return 1;
+-    } else {
+-        return 0;
+-    }
+-}
+-
+ __END__
+ 
+ =head1 NAME

Added: trunk/rpms/pptp/pptp-1.7.2-pptpsetup.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp-1.7.2-pptpsetup.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp-1.7.2-pptpsetup.patch (added)
+++ trunk/rpms/pptp/pptp-1.7.2-pptpsetup.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,23 @@
+Index: pptpsetup
+===================================================================
+RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v
+retrieving revision 1.4
+diff -u -r1.4 pptpsetup
+--- pptpsetup	2 Aug 2006 07:02:47 -0000	1.4
++++ pptpsetup	25 Mar 2009 13:41:37 -0000
+@@ -154,6 +154,7 @@
+ 
+     # delete entry from chap-secrets
+     my $chap_file = '/etc/ppp/chap-secrets';
++    my $mode = (stat($chap_file))[2] & 07777;
+ 
+     open( FILE, $chap_file )
+         or die "$0: can't read '$chap_file': $!\n";
+@@ -171,6 +172,7 @@
+     # write new chap-secrets
+     open( FILE, ">$chap_file" )
+         or die "$0: can't write '$chap_file': $!\n";
++    chmod $mode, $chap_file;
+     print FILE $new_chap;
+     close FILE;
+ 

Added: trunk/rpms/pptp/pptp.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pptp/pptp.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/pptp/pptp.spec (added)
+++ trunk/rpms/pptp/pptp.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,178 @@
+# $Id$
+# Authority: dag
+
+# ExclusiveDist: el2 el3 el4 el5
+
+Summary: Point-to-Point Tunneling Protocol (PPTP) Client
+Name: pptp
+Version: 1.7.2
+Release: 8.1%{?dist}
+License: GPLv2+
+Group: Applications/Internet
+URL: http://pptpclient.sourceforge.net/
+
+Source0: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
+Patch0: pptp-1.7.2-compat.patch
+Patch1: pptp-1.7.2-ip-path.patch
+Patch2: pptp-1.7.2-pptpsetup.patch
+Patch3: pptp-1.7.2-makedeps.patch
+Patch4: pptp-1.7.2-pptpsetup-encrypt.patch
+Patch5: pptp-1.7.2-pptpsetup-mppe.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: ppp >= 2.4.2
+Requires: /sbin/ip
+
+%description
+Client for the proprietary Microsoft Point-to-Point Tunneling
+Protocol, PPTP. Allows connection to a PPTP based VPN as used
+by employers and some cable and ADSL service providers.
+
+%package setup
+Summary: PPTP Tunnel Configuration Script
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+
+%description setup
+This package provides a simple configuration script for setting up PPTP
+tunnels.
+
+%prep
+%setup
+
+# Remove reference to stropts.h, not shipped in F9 onwards (applied upstream)
+%patch0 -p0 -b .compat
+
+# Make location of "ip" binary build-time configurable (applied upstream)
+%patch1 -p0 -b .ip-path
+
+# Retain permissions on /etc/ppp/chap-secrets (#492090, applied upstream)
+%patch2 -p0 -b .bz492090
+
+# Fix Makefile dependencies to support parallel make (applied upstream)
+%patch3 -p0 -b .makedeps
+
+# Don't check for MPPE capability in kernel or pppd unless we're creating a
+# tunnel that requires encryption (applied upstream)
+%patch4 -p0 -b .encrypt
+
+# Don't check for MPPE capability in kernel and pppd at all because current
+# Fedora releases and EL >= 5 include MPPE support out of the box (#502967)
+%patch5 -p1 -b .mppe
+
+# Pacify rpmlint
+%{__perl} -pi -e 's/install -o root -m 555 pptp/install -m0755 pptp/;' Makefile
+
+%build
+%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}" IP=/sbin/ip
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+
+%{__install} -d -m0750 %{buildroot}%{_localstatedir}/run/pptp/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
+%doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
+%doc %{_mandir}/man8/pptp.8*
+# /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the
+# Fedora ppp package hardcodes the directory name
+%config(noreplace) /etc/ppp/options.pptp
+%{_sbindir}/pptp
+%dir %attr(750, root, root) %{_localstatedir}/run/pptp/
+
+%files setup
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man8/pptpsetup.8*
+%{_sbindir}/pptpsetup
+
+%changelog
+* Mon Jan 24 2011 Dag Wieers <dag at wieers.com> - 1.7.2-8.1
+- Imported from RHEL 5.
+
+* Mon Nov 30 2009 Dennis Gregorovic <dgregor at redhat.com> - 1.7.2-8.1
+- Rebuilt for RHEL 6
+
+* Thu Sep 24 2009 Paul Howarth <paul at city-fan.org> 1.7.2-8
+- Split pptpsetup into subpackage to avoid perl dependency (#524972)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun  1 2009 Paul Howarth <paul at city-fan.org> 1.7.2-6
+- Don't check for MPPE capability in kernel and pppd unless we're creating a
+  tunnel that requires encryption
+- Don't check for MPPE capability in kernel and pppd at all because current
+  Fedora releases and EL >= 5 include MPPE support out of the box (#502967)
+
+* Wed Mar 25 2009 Paul Howarth <paul at city-fan.org> 1.7.2-5
+- Retain permissions on /etc/ppp/chap-secrets when using pptpsetup (#492090)
+- Use upstream versions of patches
+- Re-enable parallel build; Makefile dependencies now fixed
+- Use perl rather than sed to edit Makefile, for spec compatibility with
+  ancient distro releases
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon May 19 2008 Paul Howarth <paul at city-fan.org> 1.7.2-3
+- Add dependency on /sbin/ip
+- Disable parallel make - object files are missing dependency on config.h
+
+* Mon May 19 2008 Paul Howarth <paul at city-fan.org> 1.7.2-2
+- Use /sbin/ip, not /bin/ip for routing
+
+* Wed May 14 2008 Paul Howarth <paul at city-fan.org> 1.7.2-1
+- Update to 1.7.2
+- New script and manpage: pptpsetup
+- Add patch to remove reference to stropts.h, not shipped in F9 onwards
+
+* Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1.7.1-4
+- Rebuild with gcc 4.3.0 for Fedora 9
+
+* Fri Aug 24 2007 Paul Howarth <paul at city-fan.org> 1.7.1-3
+- Change download URL from df.sf.net to downloads.sf.net
+- Expand tabs in spec
+- Clarify license as GPL version 2 or later
+
+* Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 1.7.1-2
+- FE6 mass rebuild
+
+* Mon Feb 13 2006 Paul Howarth <paul at city-fan.org> 1.7.1-1
+- new upstream version 1.7.1 (fixes #166394)
+- include new document PROTOCOL-SECURITY
+- cosmetic change: replace variables with macros
+
+* Wed Aug 10 2005 Paul Howarth <paul at city-fan.org> 1.7.0-2
+- own directory %%{_localstatedir}/run/pptp
+
+* Thu Jul 28 2005 Paul Howarth <paul at city-fan.org> 1.7.0-1
+- new upstream version 1.7.0
+- remove patch, included upstream
+- edit Makefile to prevent attempted chown in %%install
+- remove redundant %%attr tag in %%files
+- honour $RPM_OPT_FLAGS
+- ensure directories have correct permissions
+
+* Fri May 27 2005 Paul Howarth <paul at city-fan.org> 1.6.0-5
+- bump and rebuild
+
+* Tue May 17 2005 Paul Howarth <paul at city-fan.org> 1.6.0-4
+- rebuild with dist tags
+
+* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-3
+- fix URL for SOURCE0 not to point to a specific sf.net mirror
+
+* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-2
+- Weed out documentation useful only to developers
+- Add dist tag
+- Use full URL for SOURCE0
+- Fix permissions on %%{_sbindir}/pptp
+
+* Fri May  6 2005 Paul Howarth <paul at city-fan.org> 1.6.0-1
+- First build for Fedora Extras, based on upstream spec file

Propchange: trunk/rpms/pptp/pptp.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/pptp/pptp.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: trunk/rpms/rear/rear.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/rear/rear.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/rear/rear.spec (original)
+++ trunk/rpms/rear/rear.spec Wed Apr 13 01:34:33 2011
@@ -3,8 +3,8 @@
 
 Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework
 Name: rear
-Version: 1.7.25
-Release: 2%{?dist}
+Version: 1.7.26
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://rear.sourceforge.net/
@@ -23,7 +23,7 @@
 Requires: mingetty
 Requires: mkisofs
 Requires: portmap
-Requires: redhat-lsb
+#Requires: redhat-lsb
 #Requires: rpcbind
 Requires: syslinux
 Requires: tar
@@ -85,6 +85,9 @@
 %{_sbindir}/rear
 
 %changelog
+* Fri Dec 10 2010 Dag Wieers <dag at wieers.com> - 1.7.26-1
+- Updated to release 1.7.26.
+
 * Mon Aug 30 2010 Dag Wieers <dag at wieers.com> - 1.7.25-2
 - Do not exclude %%{_datadir}/rear/doc/ as it is used by the mkrpm workflow.
 

Modified: trunk/rpms/reglookup/reglookup.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/reglookup/reglookup.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/reglookup/reglookup.spec (original)
+++ trunk/rpms/reglookup/reglookup.spec Wed Apr 13 01:34:33 2011
@@ -3,14 +3,14 @@
 
 Summary: Small utility for querying NT/2K/XP/2K3/Vista registries
 Name: reglookup
-Version: 0.9.0
+Version: 0.12.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://projects.sentinelchicken.org/reglookup/
 
 Source: http://projects.sentinelchicken.org/data/downloads/reglookup-%{version}.tar.gz
-Patch0: %{name}-0.9.0-DESTDIR.patch
+Patch0: reglookup-0.9.0-DESTDIR.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -45,7 +45,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc INSTALL LICENSE doc/devel/TODO doc/devel/*.txt
+%doc INSTALL LICENSE doc/devel/README
 %doc %{_mandir}/man1/reglookup.1*
 %doc %{_mandir}/man1/reglookup-recover.1*
 %doc %{_mandir}/man1/reglookup-timeline.1*
@@ -54,5 +54,8 @@
 %{_bindir}/reglookup-timeline
 
 %changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 0.12.0-1
+- Updated to release
+
 * Tue Nov 04 2008 Dag Wieers <dag at wieers.com> - 0.9.0-1
 - Initial package. (using DAR)

Modified: trunk/rpms/rtorrent/rtorrent.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/rtorrent/rtorrent.spec?rev=9815&r1=9814&r2=9815&view=diff
==============================================================================
--- trunk/rpms/rtorrent/rtorrent.spec (original)
+++ trunk/rpms/rtorrent/rtorrent.spec Wed Apr 13 01:34:33 2011
@@ -52,7 +52,6 @@
 ./configure \
     --prefix="$RESULT_DIR" \
     --exec-prefix="$RESULT_DIR" \
-    --libdir="$RESULT_DIR/usr/%{_lib}"
     --disable-manual \
     --disable-shared \
     --enable-ipv6 \
@@ -64,6 +63,7 @@
     --with-gssapi="%{_prefix}/kerberos" \
     --with-libidn \
     --with-nss
+#    --libdir="$RESULT_DIR/usr/%{_lib}" \
 
 %{__make} %{?_smp_mflags} CFLAGS="%{optflags}" install
 popd

Added: trunk/rpms/stegdetect/stegdetect-0.6-configure.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/stegdetect/stegdetect-0.6-configure.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/stegdetect/stegdetect-0.6-configure.patch (added)
+++ trunk/rpms/stegdetect/stegdetect-0.6-configure.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,1489 @@
+diff -c -P -r stegdetect-0.6-original/config.sub stegdetect-0.6/config.sub
+*** stegdetect-0.6-original/config.sub	2004-08-29 19:11:00.000000000 -0400
+--- stegdetect-0.6/config.sub	2010-03-30 13:06:32.969332813 -0400
+***************
+*** 1,8 ****
+  #! /bin/sh
+! # Configuration validation subroutine script, version 1.1.
+! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+! #   Free Software Foundation, Inc.
+! #
+  # This file is (in principle) common to ALL GNU software.
+  # The presence of a machine in this file suggests that SOME GNU software
+  # can handle that machine.  It does not imply ALL GNU software can.
+--- 1,10 ----
+  #! /bin/sh
+! # Configuration validation subroutine script.
+! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+! #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+! 
+! timestamp='2005-12-11'
+! 
+  # This file is (in principle) common to ALL GNU software.
+  # The presence of a machine in this file suggests that SOME GNU software
+  # can handle that machine.  It does not imply ALL GNU software can.
+***************
+*** 19,34 ****
+  #
+  # You should have received a copy of the GNU General Public License
+  # along with this program; if not, write to the Free Software
+! # Foundation, Inc., 59 Temple Place - Suite 330,
+! # Boston, MA 02111-1307, USA.
+! 
+  # As a special exception to the GNU General Public License, if you
+  # distribute this file as part of a program that contains a
+  # configuration script generated by Autoconf, you may include it under
+  # the same distribution terms that you use for the rest of that program.
+  
+! # Written by Per Bothner <bothner at cygnus.com>.
+! # Please send patches to <config-patches at gnu.org>.
+  #
+  # Configuration subroutine to validate and canonicalize a configuration type.
+  # Supply the specified configuration type as an argument.
+--- 21,37 ----
+  #
+  # You should have received a copy of the GNU General Public License
+  # along with this program; if not, write to the Free Software
+! # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+! # 02110-1301, USA.
+! #
+  # As a special exception to the GNU General Public License, if you
+  # distribute this file as part of a program that contains a
+  # configuration script generated by Autoconf, you may include it under
+  # the same distribution terms that you use for the rest of that program.
+  
+! 
+! # Please send patches to <config-patches at gnu.org>.  Submit a context
+! # diff and a properly formatted ChangeLog entry.
+  #
+  # Configuration subroutine to validate and canonicalize a configuration type.
+  # Supply the specified configuration type as an argument.
+***************
+*** 50,79 ****
+  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+  # It is wrong to echo any other type of specification.
+  
+! if [ x$1 = x ]
+! then
+! 	echo Configuration name missing. 1>&2
+! 	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+! 	echo "or     $0 ALIAS" 1>&2
+! 	echo where ALIAS is a recognized configuration type. 1>&2
+! 	exit 1
+! fi
+  
+! # First pass through any local machine types.
+! case $1 in
+! 	*local*)
+! 		echo $1
+! 		exit 0
+! 		;;
+! 	*)
+! 	;;
+  esac
+  
+  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+  # Here we must recognize all the valid KERNEL-OS combinations.
+  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+  case $maybe_os in
+!   nto-qnx* | linux-gnu*)
+      os=-$maybe_os
+      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+      ;;
+--- 53,127 ----
+  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+  # It is wrong to echo any other type of specification.
+  
+! me=`echo "$0" | sed -e 's,.*/,,'`
+  
+! usage="\
+! Usage: $0 [OPTION] CPU-MFR-OPSYS
+!        $0 [OPTION] ALIAS
+! 
+! Canonicalize a configuration name.
+! 
+! Operation modes:
+!   -h, --help         print this help, then exit
+!   -t, --time-stamp   print date of last modification, then exit
+!   -v, --version      print version number, then exit
+! 
+! Report bugs and patches to <config-patches at gnu.org>."
+! 
+! version="\
+! GNU config.sub ($timestamp)
+! 
+! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+! Free Software Foundation, Inc.
+! 
+! This is free software; see the source for copying conditions.  There is NO
+! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+! 
+! help="
+! Try \`$me --help' for more information."
+! 
+! # Parse command line
+! while test $# -gt 0 ; do
+!   case $1 in
+!     --time-stamp | --time* | -t )
+!        echo "$timestamp" ; exit ;;
+!     --version | -v )
+!        echo "$version" ; exit ;;
+!     --help | --h* | -h )
+!        echo "$usage"; exit ;;
+!     -- )     # Stop option processing
+!        shift; break ;;
+!     - )	# Use stdin as input.
+!        break ;;
+!     -* )
+!        echo "$me: invalid option $1$help"
+!        exit 1 ;;
+! 
+!     *local*)
+!        # First pass through any local machine types.
+!        echo $1
+!        exit ;;
+! 
+!     * )
+!        break ;;
+!   esac
+! done
+! 
+! case $# in
+!  0) echo "$me: missing argument$help" >&2
+!     exit 1;;
+!  1) ;;
+!  *) echo "$me: too many arguments$help" >&2
+!     exit 1;;
+  esac
+  
+  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+  # Here we must recognize all the valid KERNEL-OS combinations.
+  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+  case $maybe_os in
+!   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+!   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+!   storm-chaos* | os2-emx* | rtmk-nova*)
+      os=-$maybe_os
+      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+      ;;
+***************
+*** 99,105 ****
+  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+! 	-apple)
+  		os=
+  		basic_machine=$1
+  		;;
+--- 147,153 ----
+  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+! 	-apple | -axis | -knuth | -cray)
+  		os=
+  		basic_machine=$1
+  		;;
+***************
+*** 113,121 ****
+--- 161,181 ----
+  		os=-vxworks
+  		basic_machine=$1
+  		;;
++ 	-chorusos*)
++ 		os=-chorusos
++ 		basic_machine=$1
++ 		;;
++  	-chorusrdb)
++  		os=-chorusrdb
++ 		basic_machine=$1
++  		;;
+  	-hiux*)
+  		os=-hiuxwe2
+  		;;
++ 	-sco6)
++ 		os=-sco5v6
++ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++ 		;;
+  	-sco5)
+  		os=-sco3.2v5
+  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+***************
+*** 132,137 ****
+--- 192,201 ----
+  		# Don't forget version if it is 3.2v4 or newer.
+  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+  		;;
++ 	-sco5v6*)
++ 		# Don't forget version if it is 3.2v4 or newer.
++ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++ 		;;
+  	-sco*)
+  		os=-sco3.2v2
+  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+***************
+*** 171,200 ****
+  case $basic_machine in
+  	# Recognize the basic CPU types without company name.
+  	# Some are omitted here because they have special meanings below.
+! 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+! 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+! 		| 580 | i960 | h8300 \
+! 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+! 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+! 		| hppa64 \
+! 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+! 		| alphaev6[78] \
+! 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+! 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+! 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+! 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+! 		| mips64vr5000 | miprs64vr5000el | mcore \
+! 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+! 		| thumb | d10v | fr30 | avr)
+  		basic_machine=$basic_machine-unknown
+  		;;
+! 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+  		;;
+  
+  	# We use `pc' rather than `unknown'
+  	# because (1) that's what they normally are, and
+  	# (2) the word "unknown" tends to confuse beginning users.
+! 	i[34567]86)
+  	  basic_machine=$basic_machine-pc
+  	  ;;
+  	# Object if more than one company name word.
+--- 235,308 ----
+  case $basic_machine in
+  	# Recognize the basic CPU types without company name.
+  	# Some are omitted here because they have special meanings below.
+! 	1750a | 580 \
+! 	| a29k \
+! 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+! 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+! 	| am33_2.0 \
+! 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+! 	| bfin \
+! 	| c4x | clipper \
+! 	| d10v | d30v | dlx | dsp16xx \
+! 	| fr30 | frv \
+! 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+! 	| i370 | i860 | i960 | ia64 \
+! 	| ip2k | iq2000 \
+! 	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+! 	| mips | mipsbe | mipseb | mipsel | mipsle \
+! 	| mips16 \
+! 	| mips64 | mips64el \
+! 	| mips64vr | mips64vrel \
+! 	| mips64orion | mips64orionel \
+! 	| mips64vr4100 | mips64vr4100el \
+! 	| mips64vr4300 | mips64vr4300el \
+! 	| mips64vr5000 | mips64vr5000el \
+! 	| mips64vr5900 | mips64vr5900el \
+! 	| mipsisa32 | mipsisa32el \
+! 	| mipsisa32r2 | mipsisa32r2el \
+! 	| mipsisa64 | mipsisa64el \
+! 	| mipsisa64r2 | mipsisa64r2el \
+! 	| mipsisa64sb1 | mipsisa64sb1el \
+! 	| mipsisa64sr71k | mipsisa64sr71kel \
+! 	| mipstx39 | mipstx39el \
+! 	| mn10200 | mn10300 \
+! 	| mt \
+! 	| msp430 \
+! 	| ns16k | ns32k \
+! 	| or32 \
+! 	| pdp10 | pdp11 | pj | pjl \
+! 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+! 	| pyramid \
+! 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+! 	| sh64 | sh64le \
+! 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+! 	| sparcv8 | sparcv9 | sparcv9b \
+! 	| strongarm \
+! 	| tahoe | thumb | tic4x | tic80 | tron \
+! 	| v850 | v850e \
+! 	| we32k \
+! 	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+! 	| z8k)
+! 		basic_machine=$basic_machine-unknown
+! 		;;
+! 	m32c)
+  		basic_machine=$basic_machine-unknown
+  		;;
+! 	m6811 | m68hc11 | m6812 | m68hc12)
+! 		# Motorola 68HC11/12.
+! 		basic_machine=$basic_machine-unknown
+! 		os=-none
+! 		;;
+! 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+! 		;;
+! 	ms1)
+! 		basic_machine=mt-unknown
+  		;;
+  
+  	# We use `pc' rather than `unknown'
+  	# because (1) that's what they normally are, and
+  	# (2) the word "unknown" tends to confuse beginning users.
+! 	i*86 | x86_64)
+  	  basic_machine=$basic_machine-pc
+  	  ;;
+  	# Object if more than one company name word.
+***************
+*** 203,230 ****
+  		exit 1
+  		;;
+  	# Recognize the basic CPU types with company name.
+! 	# FIXME: clean up the formatting here.
+! 	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+! 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+! 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+! 	      | xmp-* | ymp-* \
+! 	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+! 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+! 	      | hppa2.0n-* | hppa64-* \
+! 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+! 	      | alphaev6[78]-* \
+! 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+! 	      | clipper-* | orion-* \
+! 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+! 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+! 	      | mips64el-* | mips64orion-* | mips64orionel-* \
+! 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+! 	      | mipstx39-* | mipstx39el-* | mcore-* \
+! 	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+! 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+! 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+! 	      | bs2000-*)
+  		;;
+  	# Recognize the various machine names and aliases which stand
+  	# for a CPU type and a company and sometimes even an OS.
+--- 311,377 ----
+  		exit 1
+  		;;
+  	# Recognize the basic CPU types with company name.
+! 	580-* \
+! 	| a29k-* \
+! 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+! 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+! 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+! 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+! 	| avr-* \
+! 	| bfin-* | bs2000-* \
+! 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+! 	| clipper-* | craynv-* | cydra-* \
+! 	| d10v-* | d30v-* | dlx-* \
+! 	| elxsi-* \
+! 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+! 	| h8300-* | h8500-* \
+! 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+! 	| i*86-* | i860-* | i960-* | ia64-* \
+! 	| ip2k-* | iq2000-* \
+! 	| m32r-* | m32rle-* \
+! 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+! 	| m88110-* | m88k-* | maxq-* | mcore-* \
+! 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+! 	| mips16-* \
+! 	| mips64-* | mips64el-* \
+! 	| mips64vr-* | mips64vrel-* \
+! 	| mips64orion-* | mips64orionel-* \
+! 	| mips64vr4100-* | mips64vr4100el-* \
+! 	| mips64vr4300-* | mips64vr4300el-* \
+! 	| mips64vr5000-* | mips64vr5000el-* \
+! 	| mips64vr5900-* | mips64vr5900el-* \
+! 	| mipsisa32-* | mipsisa32el-* \
+! 	| mipsisa32r2-* | mipsisa32r2el-* \
+! 	| mipsisa64-* | mipsisa64el-* \
+! 	| mipsisa64r2-* | mipsisa64r2el-* \
+! 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+! 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+! 	| mipstx39-* | mipstx39el-* \
+! 	| mmix-* \
+! 	| mt-* \
+! 	| msp430-* \
+! 	| none-* | np1-* | ns16k-* | ns32k-* \
+! 	| orion-* \
+! 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+! 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+! 	| pyramid-* \
+! 	| romp-* | rs6000-* \
+! 	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+! 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+! 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+! 	| sparclite-* \
+! 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+! 	| tahoe-* | thumb-* \
+! 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+! 	| tron-* \
+! 	| v850-* | v850e-* | vax-* \
+! 	| we32k-* \
+! 	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+! 	| xstormy16-* | xtensa-* \
+! 	| ymp-* \
+! 	| z8k-*)
+! 		;;
+! 	m32c-*)
+  		;;
+  	# Recognize the various machine names and aliases which stand
+  	# for a CPU type and a company and sometimes even an OS.
+***************
+*** 242,247 ****
+--- 389,397 ----
+  		basic_machine=a29k-amd
+  		os=-udi
+  		;;
++     	abacus)
++ 		basic_machine=abacus-unknown
++ 		;;
+  	adobe68k)
+  		basic_machine=m68010-adobe
+  		os=-scout
+***************
+*** 256,274 ****
+  		basic_machine=a29k-none
+  		os=-bsd
+  		;;
+  	amdahl)
+  		basic_machine=580-amdahl
+  		os=-sysv
+  		;;
+  	amiga | amiga-*)
+! 		basic_machine=m68k-cbm
+  		;;
+  	amigaos | amigados)
+! 		basic_machine=m68k-cbm
+  		os=-amigaos
+  		;;
+  	amigaunix | amix)
+! 		basic_machine=m68k-cbm
+  		os=-sysv4
+  		;;
+  	apollo68)
+--- 406,430 ----
+  		basic_machine=a29k-none
+  		os=-bsd
+  		;;
++ 	amd64)
++ 		basic_machine=x86_64-pc
++ 		;;
++ 	amd64-*)
++ 		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		;;
+  	amdahl)
+  		basic_machine=580-amdahl
+  		os=-sysv
+  		;;
+  	amiga | amiga-*)
+! 		basic_machine=m68k-unknown
+  		;;
+  	amigaos | amigados)
+! 		basic_machine=m68k-unknown
+  		os=-amigaos
+  		;;
+  	amigaunix | amix)
+! 		basic_machine=m68k-unknown
+  		os=-sysv4
+  		;;
+  	apollo68)
+***************
+*** 287,292 ****
+--- 443,452 ----
+  		basic_machine=ns32k-sequent
+  		os=-dynix
+  		;;
++ 	c90)
++ 		basic_machine=c90-cray
++ 		os=-unicos
++ 		;;
+  	convex-c1)
+  		basic_machine=c1-convex
+  		os=-bsd
+***************
+*** 307,333 ****
+  		basic_machine=c38-convex
+  		os=-bsd
+  		;;
+! 	cray | ymp)
+! 		basic_machine=ymp-cray
+  		os=-unicos
+  		;;
+! 	cray2)
+! 		basic_machine=cray2-cray
+! 		os=-unicos
+  		;;
+! 	[ctj]90-cray)
+! 		basic_machine=c90-cray
+! 		os=-unicos
+  		;;
+  	crds | unos)
+  		basic_machine=m68k-crds
+  		;;
+  	da30 | da30-*)
+  		basic_machine=m68k-da30
+  		;;
+  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+  		basic_machine=mips-dec
+  		;;
+  	delta | 3300 | motorola-3300 | motorola-delta \
+  	      | 3300-motorola | delta-motorola)
+  		basic_machine=m68k-motorola
+--- 467,511 ----
+  		basic_machine=c38-convex
+  		os=-bsd
+  		;;
+! 	cray | j90)
+! 		basic_machine=j90-cray
+  		os=-unicos
+  		;;
+! 	craynv)
+! 		basic_machine=craynv-cray
+! 		os=-unicosmp
+  		;;
+! 	cr16c)
+! 		basic_machine=cr16c-unknown
+! 		os=-elf
+  		;;
+  	crds | unos)
+  		basic_machine=m68k-crds
+  		;;
++ 	crisv32 | crisv32-* | etraxfs*)
++ 		basic_machine=crisv32-axis
++ 		;;
++ 	cris | cris-* | etrax*)
++ 		basic_machine=cris-axis
++ 		;;
++ 	crx)
++ 		basic_machine=crx-unknown
++ 		os=-elf
++ 		;;
+  	da30 | da30-*)
+  		basic_machine=m68k-da30
+  		;;
+  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+  		basic_machine=mips-dec
+  		;;
++ 	decsystem10* | dec10*)
++ 		basic_machine=pdp10-dec
++ 		os=-tops10
++ 		;;
++ 	decsystem20* | dec20*)
++ 		basic_machine=pdp10-dec
++ 		os=-tops20
++ 		;;
+  	delta | 3300 | motorola-3300 | motorola-delta \
+  	      | 3300-motorola | delta-motorola)
+  		basic_machine=m68k-motorola
+***************
+*** 336,341 ****
+--- 514,523 ----
+  		basic_machine=m88k-motorola
+  		os=-sysv3
+  		;;
++ 	djgpp)
++ 		basic_machine=i586-pc
++ 		os=-msdosdjgpp
++ 		;;
+  	dpx20 | dpx20-*)
+  		basic_machine=rs6000-bull
+  		os=-bosx
+***************
+*** 369,374 ****
+--- 551,560 ----
+  		basic_machine=tron-gmicro
+  		os=-sysv
+  		;;
++ 	go32)
++ 		basic_machine=i386-pc
++ 		os=-go32
++ 		;;
+  	h3050r* | hiux*)
+  		basic_machine=hppa1.1-hitachi
+  		os=-hiuxwe2
+***************
+*** 444,462 ****
+  		basic_machine=i370-ibm
+  		;;
+  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+! 	i[34567]86v32)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv32
+  		;;
+! 	i[34567]86v4*)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv4
+  		;;
+! 	i[34567]86v)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv
+  		;;
+! 	i[34567]86sol2)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-solaris2
+  		;;
+--- 630,648 ----
+  		basic_machine=i370-ibm
+  		;;
+  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+! 	i*86v32)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv32
+  		;;
+! 	i*86v4*)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv4
+  		;;
+! 	i*86v)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-sysv
+  		;;
+! 	i*86sol2)
+  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+  		os=-solaris2
+  		;;
+***************
+*** 468,481 ****
+  		basic_machine=i386-unknown
+  		os=-vsta
+  		;;
+- 	i386-go32 | go32)
+- 		basic_machine=i386-unknown
+- 		os=-go32
+- 		;;
+- 	i386-mingw32 | mingw32)
+- 		basic_machine=i386-unknown
+- 		os=-mingw32
+- 		;;
+  	iris | iris4d)
+  		basic_machine=mips-sgi
+  		case $os in
+--- 654,659 ----
+***************
+*** 501,506 ****
+--- 679,688 ----
+  		basic_machine=ns32k-utek
+  		os=-sysv
+  		;;
++ 	mingw32)
++ 		basic_machine=i386-pc
++ 		os=-mingw32
++ 		;;
+  	miniframe)
+  		basic_machine=m68000-convergent
+  		;;
+***************
+*** 508,539 ****
+  		basic_machine=m68k-atari
+  		os=-mint
+  		;;
+- 	mipsel*-linux*)
+- 		basic_machine=mipsel-unknown
+- 		os=-linux-gnu
+- 		;;
+- 	mips*-linux*)
+- 		basic_machine=mips-unknown
+- 		os=-linux-gnu
+- 		;;
+  	mips3*-*)
+  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+  		;;
+  	mips3*)
+  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+  		;;
+- 	mmix*)
+- 		basic_machine=mmix-knuth
+- 		os=-mmixware
+- 		;;
+  	monitor)
+  		basic_machine=m68k-rom68k
+  		os=-coff
+  		;;
+  	msdos)
+! 		basic_machine=i386-unknown
+  		os=-msdos
+  		;;
+  	mvs)
+  		basic_machine=i370-ibm
+  		os=-mvs
+--- 690,716 ----
+  		basic_machine=m68k-atari
+  		os=-mint
+  		;;
+  	mips3*-*)
+  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+  		;;
+  	mips3*)
+  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+  		;;
+  	monitor)
+  		basic_machine=m68k-rom68k
+  		os=-coff
+  		;;
++ 	morphos)
++ 		basic_machine=powerpc-unknown
++ 		os=-morphos
++ 		;;
+  	msdos)
+! 		basic_machine=i386-pc
+  		os=-msdos
+  		;;
++ 	ms1-*)
++ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++ 		;;
+  	mvs)
+  		basic_machine=i370-ibm
+  		os=-mvs
+***************
+*** 595,600 ****
+--- 772,781 ----
+  		basic_machine=i960-intel
+  		os=-mon960
+  		;;
++ 	nonstopux)
++ 		basic_machine=mips-compaq
++ 		os=-nonstopux
++ 		;;
+  	np1)
+  		basic_machine=np1-gould
+  		;;
+***************
+*** 605,610 ****
+--- 786,798 ----
+  		basic_machine=hppa1.1-oki
+  		os=-proelf
+  		;;
++ 	openrisc | openrisc-*)
++ 		basic_machine=or32-unknown
++ 		;;
++ 	os400)
++ 		basic_machine=powerpc-ibm
++ 		os=-os400
++ 		;;
+  	OSE68000 | ose68000)
+  		basic_machine=m68000-ericsson
+  		os=-ose
+***************
+*** 627,671 ****
+  	pbb)
+  		basic_machine=m68k-tti
+  		;;
+!         pc532 | pc532-*)
+  		basic_machine=ns32k-pc532
+  		;;
+! 	pentium | p5 | k5 | k6 | nexen)
+  		basic_machine=i586-pc
+  		;;
+! 	pentiumpro | p6 | 6x86)
+  		basic_machine=i686-pc
+  		;;
+! 	pentiumii | pentium2)
+  		basic_machine=i786-pc
+  		;;
+! 	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+! 	pentiumpro-* | p6-* | 6x86-*)
+  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+! 	pentiumii-* | pentium2-*)
+  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+  	pn)
+  		basic_machine=pn-gould
+  		;;
+! 	power)	basic_machine=rs6000-ibm
+  		;;
+  	ppc)	basic_machine=powerpc-unknown
+! 	        ;;
+  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+  	ppcle | powerpclittle | ppc-le | powerpc-little)
+  		basic_machine=powerpcle-unknown
+! 	        ;;
+  	ppcle-* | powerpclittle-*)
+  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+  	ps2)
+  		basic_machine=i386-ibm
+  		;;
+  	rom68k)
+  		basic_machine=m68k-rom68k
+  		os=-coff
+--- 815,883 ----
+  	pbb)
+  		basic_machine=m68k-tti
+  		;;
+! 	pc532 | pc532-*)
+  		basic_machine=ns32k-pc532
+  		;;
+! 	pentium | p5 | k5 | k6 | nexgen | viac3)
+  		basic_machine=i586-pc
+  		;;
+! 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+  		basic_machine=i686-pc
+  		;;
+! 	pentiumii | pentium2 | pentiumiii | pentium3)
+! 		basic_machine=i686-pc
+! 		;;
+! 	pentium4)
+  		basic_machine=i786-pc
+  		;;
+! 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+! 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+! 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+! 		;;
+! 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+! 	pentium4-*)
+  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+  	pn)
+  		basic_machine=pn-gould
+  		;;
+! 	power)	basic_machine=power-ibm
+  		;;
+  	ppc)	basic_machine=powerpc-unknown
+! 		;;
+  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
+  	ppcle | powerpclittle | ppc-le | powerpc-little)
+  		basic_machine=powerpcle-unknown
+! 		;;
+  	ppcle-* | powerpclittle-*)
+  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+  		;;
++ 	ppc64)	basic_machine=powerpc64-unknown
++ 		;;
++ 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		;;
++ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++ 		basic_machine=powerpc64le-unknown
++ 		;;
++ 	ppc64le-* | powerpc64little-*)
++ 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		;;
+  	ps2)
+  		basic_machine=i386-ibm
+  		;;
++ 	pw32)
++ 		basic_machine=i586-unknown
++ 		os=-pw32
++ 		;;
++ 	rdos)
++ 		basic_machine=i386-pc
++ 		os=-rdos
++ 		;;
+  	rom68k)
+  		basic_machine=m68k-rom68k
+  		os=-coff
+***************
+*** 676,685 ****
+--- 888,913 ----
+  	rtpc | rtpc-*)
+  		basic_machine=romp-ibm
+  		;;
++ 	s390 | s390-*)
++ 		basic_machine=s390-ibm
++ 		;;
++ 	s390x | s390x-*)
++ 		basic_machine=s390x-ibm
++ 		;;
+  	sa29200)
+  		basic_machine=a29k-amd
+  		os=-udi
+  		;;
++ 	sb1)
++ 		basic_machine=mipsisa64sb1-unknown
++ 		;;
++ 	sb1el)
++ 		basic_machine=mipsisa64sb1el-unknown
++ 		;;
++ 	sei)
++ 		basic_machine=mips-sei
++ 		os=-seiux
++ 		;;
+  	sequent)
+  		basic_machine=i386-sequent
+  		;;
+***************
+*** 687,693 ****
+  		basic_machine=sh-hitachi
+  		os=-hms
+  		;;
+! 	sparclite-wrs)
+  		basic_machine=sparclite-wrs
+  		os=-vxworks
+  		;;
+--- 915,924 ----
+  		basic_machine=sh-hitachi
+  		os=-hms
+  		;;
+! 	sh64)
+! 		basic_machine=sh64-unknown
+! 		;;
+! 	sparclite-wrs | simso-wrs)
+  		basic_machine=sparclite-wrs
+  		os=-vxworks
+  		;;
+***************
+*** 754,771 ****
+  		os=-dynix
+  		;;
+  	t3e)
+! 		basic_machine=t3e-cray
+  		os=-unicos
+  		;;
+  	tx39)
+  		basic_machine=mipstx39-unknown
+  		;;
+  	tx39el)
+  		basic_machine=mipstx39el-unknown
+  		;;
+  	tower | tower-32)
+  		basic_machine=m68k-ncr
+  		;;
+  	udi29k)
+  		basic_machine=a29k-amd
+  		os=-udi
+--- 985,1026 ----
+  		os=-dynix
+  		;;
+  	t3e)
+! 		basic_machine=alphaev5-cray
+  		os=-unicos
+  		;;
++ 	t90)
++ 		basic_machine=t90-cray
++ 		os=-unicos
++ 		;;
++ 	tic54x | c54x*)
++ 		basic_machine=tic54x-unknown
++ 		os=-coff
++ 		;;
++ 	tic55x | c55x*)
++ 		basic_machine=tic55x-unknown
++ 		os=-coff
++ 		;;
++ 	tic6x | c6x*)
++ 		basic_machine=tic6x-unknown
++ 		os=-coff
++ 		;;
+  	tx39)
+  		basic_machine=mipstx39-unknown
+  		;;
+  	tx39el)
+  		basic_machine=mipstx39el-unknown
+  		;;
++ 	toad1)
++ 		basic_machine=pdp10-xkl
++ 		os=-tops20
++ 		;;
+  	tower | tower-32)
+  		basic_machine=m68k-ncr
+  		;;
++ 	tpf)
++ 		basic_machine=s390x-ibm
++ 		os=-tpf
++ 		;;
+  	udi29k)
+  		basic_machine=a29k-amd
+  		os=-udi
+***************
+*** 787,794 ****
+  		os=-vms
+  		;;
+  	vpp*|vx|vx-*)
+!                basic_machine=f301-fujitsu
+!                ;;
+  	vxworks960)
+  		basic_machine=i960-wrs
+  		os=-vxworks
+--- 1042,1049 ----
+  		os=-vms
+  		;;
+  	vpp*|vx|vx-*)
+! 		basic_machine=f301-fujitsu
+! 		;;
+  	vxworks960)
+  		basic_machine=i960-wrs
+  		os=-vxworks
+***************
+*** 809,821 ****
+  		basic_machine=hppa1.1-winbond
+  		os=-proelf
+  		;;
+! 	xmp)
+! 		basic_machine=xmp-cray
+! 		os=-unicos
+  		;;
+!         xps | xps100)
+  		basic_machine=xps100-honeywell
+  		;;
+  	z8k-*-coff)
+  		basic_machine=z8k-unknown
+  		os=-sim
+--- 1064,1080 ----
+  		basic_machine=hppa1.1-winbond
+  		os=-proelf
+  		;;
+! 	xbox)
+! 		basic_machine=i686-pc
+! 		os=-mingw32
+  		;;
+! 	xps | xps100)
+  		basic_machine=xps100-honeywell
+  		;;
++ 	ymp)
++ 		basic_machine=ymp-cray
++ 		os=-unicos
++ 		;;
+  	z8k-*-coff)
+  		basic_machine=z8k-unknown
+  		os=-sim
+***************
+*** 836,867 ****
+  	op60c)
+  		basic_machine=hppa1.1-oki
+  		;;
+- 	mips)
+- 		if [ x$os = x-linux-gnu ]; then
+- 			basic_machine=mips-unknown
+- 		else
+- 			basic_machine=mips-mips
+- 		fi
+- 		;;
+  	romp)
+  		basic_machine=romp-ibm
+  		;;
+  	rs6000)
+  		basic_machine=rs6000-ibm
+  		;;
+  	vax)
+  		basic_machine=vax-dec
+  		;;
+  	pdp11)
+  		basic_machine=pdp11-dec
+  		;;
+  	we32k)
+  		basic_machine=we32k-att
+  		;;
+! 	sparc | sparcv9)
+  		basic_machine=sparc-sun
+  		;;
+!         cydra)
+  		basic_machine=cydra-cydrome
+  		;;
+  	orion)
+--- 1095,1129 ----
+  	op60c)
+  		basic_machine=hppa1.1-oki
+  		;;
+  	romp)
+  		basic_machine=romp-ibm
+  		;;
++ 	mmix)
++ 		basic_machine=mmix-knuth
++ 		;;
+  	rs6000)
+  		basic_machine=rs6000-ibm
+  		;;
+  	vax)
+  		basic_machine=vax-dec
+  		;;
++ 	pdp10)
++ 		# there are many clones, so DEC is not a safe bet
++ 		basic_machine=pdp10-unknown
++ 		;;
+  	pdp11)
+  		basic_machine=pdp11-dec
+  		;;
+  	we32k)
+  		basic_machine=we32k-att
+  		;;
+! 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+! 		basic_machine=sh-unknown
+! 		;;
+! 	sparc | sparcv8 | sparcv9 | sparcv9b)
+  		basic_machine=sparc-sun
+  		;;
+! 	cydra)
+  		basic_machine=cydra-cydrome
+  		;;
+  	orion)
+***************
+*** 876,884 ****
+  	pmac | pmac-mpw)
+  		basic_machine=powerpc-apple
+  		;;
+! 	c4x*)
+! 		basic_machine=c4x-none
+! 		os=-coff
+  		;;
+  	*)
+  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+--- 1138,1145 ----
+  	pmac | pmac-mpw)
+  		basic_machine=powerpc-apple
+  		;;
+! 	*-unknown)
+! 		# Make sure to match an already-canonicalized machine name.
+  		;;
+  	*)
+  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+***************
+*** 932,966 ****
+  	      | -aos* \
+  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+! 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+! 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+! 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+! 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+! 	      | -openstep* | -oskit*)
+  	# Remember, each alternative MUST END IN *, to match a version number.
+  		;;
+  	-qnx*)
+  		case $basic_machine in
+! 		    x86-* | i[34567]86-*)
+  			;;
+  		    *)
+  			os=-nto$os
+  			;;
+  		esac
+  		;;
+  	-nto*)
+! 		os=-nto-qnx
+  		;;
+  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+! 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+  		;;
+  	-mac*)
+  		os=`echo $os | sed -e 's|mac|macos|'`
+  		;;
+  	-linux*)
+  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+  		;;
+--- 1193,1240 ----
+  	      | -aos* \
+  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+! 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+! 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+! 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ 	      | -chorusos* | -chorusrdb* \
+  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+! 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+! 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+! 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+! 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+! 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+! 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+! 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+! 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+! 	      | -skyos* | -haiku* | -rdos*)
+  	# Remember, each alternative MUST END IN *, to match a version number.
+  		;;
+  	-qnx*)
+  		case $basic_machine in
+! 		    x86-* | i*86-*)
+  			;;
+  		    *)
+  			os=-nto$os
+  			;;
+  		esac
+  		;;
++ 	-nto-qnx*)
++ 		;;
+  	-nto*)
+! 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+  		;;
+  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+! 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+  		;;
+  	-mac*)
+  		os=`echo $os | sed -e 's|mac|macos|'`
+  		;;
++ 	-linux-dietlibc)
++ 		os=-linux-dietlibc
++ 		;;
+  	-linux*)
+  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+  		;;
+***************
+*** 973,978 ****
+--- 1247,1255 ----
+  	-opened*)
+  		os=-openedition
+  		;;
++         -os400*)
++ 		os=-os400
++ 		;;
+  	-wince*)
+  		os=-wince
+  		;;
+***************
+*** 991,1006 ****
+  	-acis*)
+  		os=-aos
+  		;;
+  	-386bsd)
+  		os=-bsd
+  		;;
+  	-ctix* | -uts*)
+  		os=-sysv
+  		;;
+  	-ns2 )
+! 	        os=-nextstep2
+  		;;
+! 	-nsk)
+  		os=-nsk
+  		;;
+  	# Preserve the version number of sinix5.
+--- 1268,1292 ----
+  	-acis*)
+  		os=-aos
+  		;;
++ 	-atheos*)
++ 		os=-atheos
++ 		;;
++ 	-syllable*)
++ 		os=-syllable
++ 		;;
+  	-386bsd)
+  		os=-bsd
+  		;;
+  	-ctix* | -uts*)
+  		os=-sysv
+  		;;
++ 	-nova*)
++ 		os=-rtmk-nova
++ 		;;
+  	-ns2 )
+! 		os=-nextstep2
+  		;;
+! 	-nsk*)
+  		os=-nsk
+  		;;
+  	# Preserve the version number of sinix5.
+***************
+*** 1010,1015 ****
+--- 1296,1304 ----
+  	-sinix*)
+  		os=-sysv4
+  		;;
++         -tpf*)
++ 		os=-tpf
++ 		;;
+  	-triton*)
+  		os=-sysv3
+  		;;
+***************
+*** 1037,1044 ****
+  	-xenix)
+  		os=-xenix
+  		;;
+!         -*mint | -*MiNT)
+! 	        os=-mint
+  		;;
+  	-none)
+  		;;
+--- 1326,1342 ----
+  	-xenix)
+  		os=-xenix
+  		;;
+! 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+! 		os=-mint
+! 		;;
+! 	-aros*)
+! 		os=-aros
+! 		;;
+! 	-kaos*)
+! 		os=-kaos
+! 		;;
+! 	-zvmoe)
+! 		os=-zvmoe
+  		;;
+  	-none)
+  		;;
+***************
+*** 1071,1077 ****
+  	arm*-semi)
+  		os=-aout
+  		;;
+!         pdp11-*)
+  		os=-none
+  		;;
+  	*-dec | vax-*)
+--- 1369,1382 ----
+  	arm*-semi)
+  		os=-aout
+  		;;
+!     c4x-* | tic4x-*)
+!         os=-coff
+!         ;;
+! 	# This must come before the *-dec entry.
+! 	pdp10-*)
+! 		os=-tops20
+! 		;;
+! 	pdp11-*)
+  		os=-none
+  		;;
+  	*-dec | vax-*)
+***************
+*** 1098,1103 ****
+--- 1403,1411 ----
+  	mips*-*)
+  		os=-elf
+  		;;
++ 	or32-*)
++ 		os=-coff
++ 		;;
+  	*-tti)	# must be before sparc entry or we get the wrong os.
+  		os=-sysv3
+  		;;
+***************
+*** 1107,1115 ****
+--- 1415,1429 ----
+  	*-be)
+  		os=-beos
+  		;;
++ 	*-haiku)
++ 		os=-haiku
++ 		;;
+  	*-ibm)
+  		os=-aix
+  		;;
++     	*-knuth)
++ 		os=-mmixware
++ 		;;
+  	*-wec)
+  		os=-proelf
+  		;;
+***************
+*** 1161,1185 ****
+  	*-next)
+  		os=-nextstep3
+  		;;
+!         *-gould)
+  		os=-sysv
+  		;;
+!         *-highlevel)
+  		os=-bsd
+  		;;
+  	*-encore)
+  		os=-bsd
+  		;;
+!         *-sgi)
+  		os=-irix
+  		;;
+!         *-siemens)
+  		os=-sysv4
+  		;;
+  	*-masscomp)
+  		os=-rtu
+  		;;
+! 	f301-fujitsu)
+  		os=-uxpv
+  		;;
+  	*-rom68k)
+--- 1475,1499 ----
+  	*-next)
+  		os=-nextstep3
+  		;;
+! 	*-gould)
+  		os=-sysv
+  		;;
+! 	*-highlevel)
+  		os=-bsd
+  		;;
+  	*-encore)
+  		os=-bsd
+  		;;
+! 	*-sgi)
+  		os=-irix
+  		;;
+! 	*-siemens)
+  		os=-sysv4
+  		;;
+  	*-masscomp)
+  		os=-rtu
+  		;;
+! 	f30[01]-fujitsu | f700-fujitsu)
+  		os=-uxpv
+  		;;
+  	*-rom68k)
+***************
+*** 1242,1251 ****
+  			-mvs* | -opened*)
+  				vendor=ibm
+  				;;
+  			-ptx*)
+  				vendor=sequent
+  				;;
+! 			-vxsim* | -vxworks*)
+  				vendor=wrs
+  				;;
+  			-aux*)
+--- 1556,1571 ----
+  			-mvs* | -opened*)
+  				vendor=ibm
+  				;;
++ 			-os400*)
++ 				vendor=ibm
++ 				;;
+  			-ptx*)
+  				vendor=sequent
+  				;;
+! 			-tpf*)
+! 				vendor=ibm
+! 				;;
+! 			-vxsim* | -vxworks* | -windiss*)
+  				vendor=wrs
+  				;;
+  			-aux*)
+***************
+*** 1257,1268 ****
+  			-mpw* | -macos*)
+  				vendor=apple
+  				;;
+! 			-*mint | -*MiNT)
+  				vendor=atari
+  				;;
+  		esac
+  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+  		;;
+  esac
+  
+  echo $basic_machine$os
+--- 1577,1599 ----
+  			-mpw* | -macos*)
+  				vendor=apple
+  				;;
+! 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+  				vendor=atari
+  				;;
++ 			-vos*)
++ 				vendor=stratus
++ 				;;
+  		esac
+  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+  		;;
+  esac
+  
+  echo $basic_machine$os
++ exit
++ 
++ # Local variables:
++ # eval: (add-hook 'write-file-hooks 'time-stamp)
++ # time-stamp-start: "timestamp='"
++ # time-stamp-format: "%:y-%02m-%02d"
++ # time-stamp-end: "'"
++ # End:

Added: trunk/rpms/stegdetect/stegdetect.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/stegdetect/stegdetect.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/stegdetect/stegdetect.spec (added)
+++ trunk/rpms/stegdetect/stegdetect.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,60 @@
+# $Id$
+# Authority: dag
+
+%{?el6:%define _without_gtk 1}
+%{?el5:%define _without_gtk 1}
+
+Summary: Detect and extract steganography messages inside JPEG
+Name: stegdetect
+Version: 0.6
+Release: 1%{?dist}
+License: BSD
+Group: Applications/File
+URL: http://www.outguess.org/detection.php
+
+Source0: http://www.outguess.org/stegdetect-%{version}.tar.gz
+Patch0: stegdetect-0.6-configure.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++
+%{!?_without_gtk:BuildRequires: gtk+-devel}
+
+%description
+Stegdetect is an automated tool for detecting steganographic content in
+images. It is capable of detecting several different steganographic
+methods to embed hidden information in JPEG images. Currently, the
+detectable schemes are jsteg, jphide, invisible secrets, outguess 01.3b,
+F5, appendX, and camouflage. Using linear discriminant analysis, it also
+supports detection of new stego systems. Stegbreak is used to launch
+dictionary attacks against JSteg-Shell, JPHide, and OutGuess 0.13b.
+
+%prep
+%setup
+%patch0 -p1
+
+%{__perl} -pi -e 's|debug|stegdebug|g' stegdetect.c
+
+%build
+%configure --program-prefix="%{?_program_prefix}"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" SUBDIRS=""
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man1/stegbreak.1*
+%doc %{_mandir}/man1/stegdetect.1*
+%{_bindir}/stegbreak
+%{_bindir}/stegcompare
+%{_bindir}/stegdeimage
+%{_bindir}/stegdetect
+%{!?_without_gtk:%{_bindir}/xsteg}
+
+%changelog
+* Wed Feb 16 2011 Dag Wieers <dag at wieers.com> - 0.6-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/stegdetect/stegdetect.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/stegdetect/stegdetect.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Added: trunk/rpms/xrdp/xrdp-0.4.0-docs.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/xrdp/xrdp-0.4.0-docs.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/xrdp/xrdp-0.4.0-docs.patch (added)
+++ trunk/rpms/xrdp/xrdp-0.4.0-docs.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,16 @@
+--- docs/Makefile	2006-03-04 04:02:02 +0300
++++ docs/Makefile	2007-08-27 15:36:47 +0400
+@@ -12,8 +12,8 @@
+ install:
+ 
+ installdeb:
+-	install man/sesman.8 $(DESTDIRDEB)/usr/man/man8/sesman.8
+-	install man/sesrun.8 $(DESTDIRDEB)/usr/man/man8/sesrun.8
+-	install man/xrdp.8 $(DESTDIRDEB)/usr/man/man8/xrdp.8
+-	install man/sesman.ini.5 $(DESTDIRDEB)/usr/man/man5/sesman.ini.5
+-	install man/xrdp.ini.5 $(DESTDIRDEB)/usr/man/man5/xrdp.ini.5
++	install -Dp -m0644 man/sesman.8 $(DESTDIRDEB)/usr/share/man/man8/sesman.8
++	install -Dp -m0644 man/sesrun.8 $(DESTDIRDEB)/usr/share/man/man8/sesrun.8
++	install -Dp -m0644 man/xrdp.8 $(DESTDIRDEB)/usr/share/man/man8/xrdp.8
++	install -Dp -m0644 man/sesman.ini.5 $(DESTDIRDEB)/usr/share/man/man5/sesman.ini.5
++	install -Dp -m0644 man/xrdp.ini.5 $(DESTDIRDEB)/usr/share/man/man5/xrdp.ini.5

Added: trunk/rpms/xrdp/xrdp-0.4.0-sesman.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/xrdp/xrdp-0.4.0-sesman.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/xrdp/xrdp-0.4.0-sesman.patch (added)
+++ trunk/rpms/xrdp/xrdp-0.4.0-sesman.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,69 @@
+--- sesman/Makefile	2007-05-28 03:18:14 +0400
++++ sesman/Makefile	2007-08-27 13:17:23 +0400
+@@ -2,7 +2,9 @@
+ 
+ SESMANOBJ = sesman.o config.o sig.o session.o env.o \
+             os_calls.o d3des.o list.o file.o log.o access.o \
+-            scp.o scp_v0.o scp_v1.o thread.o lock.o
++            scp.o scp_v0.o scp_v1.o thread.o lock.o libscp/libscp_init.o \
++	    libscp/libscp_tcp.o libscp/libscp_lock.o libscp/libscp_vX.o \
++	    libscp/libscp_v0.o libscp/libscp_v1s.o
+ 
+ SESSVCOBJ = sessvc.o os_calls.o
+ 
+@@ -16,31 +18,32 @@
+ 	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
+ 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
+ 
+-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
+-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
++CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES) 
++LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
+ C_OS_FLAGS = $(CFLAGS) -c
++LDADD = -ldl -lpthread -lscp
+ CC = gcc
+ 
+-all: libscp_ pam tools
++all: libscp_ pam tools 
+ 
+ nopam: libscp_ no-pam tools
+ 
+ kerberos: libscp_ kerberos-base tools
+ 
+ no-pam: $(SESMANOBJ) verify_user.o
+-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
++	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt $(LDADD)
+ 
+ pam: $(SESMANOBJ) verify_user_pam.o
+-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
++	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam $(LDADD)
+ 
+ pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
+-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
++	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass $(LDADD)
+ 
+ kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
+-	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
++	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 $(LDADD)
+ 
+ sessvc: $(SESSVCOBJ)
+-	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) 
++	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LDADD)
+ 
+ tools: sessvc
+ 	make -C tools
+@@ -67,7 +70,7 @@
+ 	install sesman.ini $(DESTDIRDEB)/etc/xrdp/sesman.ini
+ 
+ os_calls.o: ../common/os_calls.c
+-	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
++	$(CC) $(C_OS_FLAGS) ../common/os_calls.c $(LDADD)
+ 
+ d3des.o: ../common/d3des.c
+ 	$(CC) $(C_OS_FLAGS) ../common/d3des.c
+@@ -79,4 +82,4 @@
+ 	$(CC) $(C_OS_FLAGS) ../common/file.c
+ 
+ log.o: ../common/log.c
+-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
++	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c -ldl

Added: trunk/rpms/xrdp/xrdp-0.4.0-sesmantools.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/xrdp/xrdp-0.4.0-sesmantools.patch?rev=9815&view=markup
==============================================================================
--- trunk/rpms/xrdp/xrdp-0.4.0-sesmantools.patch (added)
+++ trunk/rpms/xrdp/xrdp-0.4.0-sesmantools.patch Wed Apr 13 01:34:33 2011
@@ -1,0 +1,21 @@
+--- sesman/tools/Makefile	2007-05-23 10:56:18 +0400
++++ sesman/tools/Makefile	2007-08-27 13:22:03 +0400
+@@ -16,15 +16,16 @@
+ CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
+ LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
+ C_OS_FLAGS = $(CFLAGS) -c
++LDADD = -ldl -lpthread -lscp
+ CC = gcc
+ 
+ all: stest srun
+ 
+ stest: $(SESTESTOBJ)
+-	$(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
++	$(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LDADD)
+ 
+ srun: $(SESRUNOBJ)
+-	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
++	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LDADD)
+ 
+ os_calls.o: ../../common/os_calls.c
+ 	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c

Added: trunk/rpms/xrdp/xrdp.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/xrdp/xrdp.spec?rev=9815&view=markup
==============================================================================
--- trunk/rpms/xrdp/xrdp.spec (added)
+++ trunk/rpms/xrdp/xrdp.spec Wed Apr 13 01:34:33 2011
@@ -1,0 +1,60 @@
+# $Id$
+# Authority: dag
+
+Summary: Open source remote desktop protocol (RDP) server
+Name: xrdp
+Version: 0.4.0
+Release: 1%{?dist}
+License: GPL
+Group: User Interface/X
+URL: http://xrdp.sourceforge.net/
+
+Source: http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz
+Patch0: xrdp-0.4.0-sesman.patch
+Patch1: xrdp-0.4.0-sesmantools.patch
+Patch2: xrdp-0.4.0-docs.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+#BuildRequires: libnss-mysql
+#BuildRequires: libpam-devel
+#BuildRequires: libssl-devel
+
+%description
+The goal of this project is to provide a fully functional Linux terminal
+server, capable of accepting connections from rdesktop and Microsoft's
+own terminal server / remote desktop clients.
+
+%prep
+%setup
+%patch0
+%patch1
+%patch2
+
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' Makefile */Makefile
+
+%build
+#configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} installdeb DESTDIRDEB="%{buildroot}"
+%{__install} -Dp -m0755 sesman/libscp/libscp.so %{buildroot}%{_libdir}/xrdp/libscp.so
+
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{_sysconfdir}/init.d/xrdp_control.sh
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%doc COPYING *.txt instfiles/*.sh
+%doc %{_mandir}/man5/*.5*
+%doc %{_mandir}/man8/*.8*
+%config(noreplace) %{_sysconfdir}/xrdp/
+%config(noreplace) %{_sysconfdir}/pam.d/sesman
+%{_libdir}/xrdp/
+
+%changelog
+* Wed Sep 12 2007 Dag Wieers <dag at wieers.com> - 0.4.0-1
+- Initial package. (using DAR)

Propchange: trunk/rpms/xrdp/xrdp.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rpms/xrdp/xrdp.spec
------------------------------------------------------------------------------
    svn:keywords = Id Revision




More information about the commits mailing list