2007-01-03 Laszlo (Laca) Peter <
[email protected]>
* SFEbeagle.spec: s/sqlite3/sqlite/, fixes 1615496
* SFEdevice-manager.spec: fix directory attributes
* SFEdvdauthor.spec: fix dependencies
* SFEf-spot.spec: s/sqlite3/sqlite/, fixes 1617223
* SFEfileutils.spec: delete. superseded by SFEcoreutils.
* SFEgajim.spec: s/sqlite3/sqlite, fixes 1617230
* SFEliveMedia.spec: bump to 2006.12.31, add patch SOLARIS-macro.diff
* SFEmplayer.spec:
- re-add patches cddb and makefile-libfame-dep after merging with
1.0rc1
- add patches asmrules_20061231 (fixes a buffer overflow) and
cabac-asm (disables some asm stuff that doesn't seem to compile
on Solaris.
* SFEpycurl.spec: (new) pycurl - python interface to libcurl.
Needed for proxy support in bzr.
* SFEpysqlite.spec: s/sqlite3/sqlite/, fixes 1617228.
* SFEsqlite.spec: rename patch from sqlite3-* to sqlite-* for
consistency
* SFExpdf.spec: delete. superseded by SUNWgnome-pdf-viewer (evince),
already in Solaris.
* SFEcurl.spec: bump to 7.16.0
* SFEbzr.spec: bump to 0.13
* SFEseamonkey.spec: bump to 1.0.7
* patches/liveMedia-01-SOLARIS-macro.diff: (new) patch that for
using standard macros to detect Solaris, needed to build mplayer
cleanly.
* patches/mplayer-01-cddb.diff: merge.
* patches/mplayer-02-makefile-libfame-dep.diff: megre.
* patches/mplayer-03-asmrules_20061231.diff: security fix for
http://www.debian.org/security/2006/dsa-1244 (CVE-2006-6172)
* patches/mplayer-04-cabac-asm.diff: disable some asm stuff in
cabac.h that doesn't seem to compile on Solaris, use C instead
* patches/sqlite3-01-thread-lock-test.diff: rename to
sqlite-01-thread-lock-test.diff
* patches/pycurl-01-source-opts.diff: patch taken from pycurl
CVS HEAD needed for compiling with curl 7.16.0
--- a/ChangeLog Wed Jan 03 11:55:39 2007 +0000
+++ b/ChangeLog Thu Jan 04 02:03:16 2007 +0000
@@ -1,3 +1,42 @@
+2007-01-03 Laszlo (Laca) Peter <[email protected]>
+
+ * SFEbeagle.spec: s/sqlite3/sqlite/, fixes 1615496
+ * SFEdevice-manager.spec: fix directory attributes
+ * SFEdvdauthor.spec: fix dependencies
+ * SFEf-spot.spec: s/sqlite3/sqlite/, fixes 1617223
+ * SFEfileutils.spec: delete. superseded by SFEcoreutils.
+ * SFEgajim.spec: s/sqlite3/sqlite, fixes 1617230
+ * SFEliveMedia.spec: bump to 2006.12.31, add patch SOLARIS-macro.diff
+ * SFEmplayer.spec:
+ - re-add patches cddb and makefile-libfame-dep after merging with
+ 1.0rc1
+ - add patches asmrules_20061231 (fixes a buffer overflow) and
+ cabac-asm (disables some asm stuff that doesn't seem to compile
+ on Solaris.
+ * SFEpycurl.spec: (new) pycurl - python interface to libcurl.
+ Needed for proxy support in bzr.
+ * SFEpysqlite.spec: s/sqlite3/sqlite/, fixes 1617228.
+ * SFEsqlite.spec: rename patch from sqlite3-* to sqlite-* for
+ consistency
+ * SFExpdf.spec: delete. superseded by SUNWgnome-pdf-viewer (evince),
+ already in Solaris.
+ * SFEcurl.spec: bump to 7.16.0
+ * SFEbzr.spec: bump to 0.13
+ * SFEseamonkey.spec: bump to 1.0.7
+ * patches/liveMedia-01-SOLARIS-macro.diff: (new) patch that for
+ using standard macros to detect Solaris, needed to build mplayer
+ cleanly.
+ * patches/mplayer-01-cddb.diff: merge.
+ * patches/mplayer-02-makefile-libfame-dep.diff: megre.
+ * patches/mplayer-03-asmrules_20061231.diff: security fix for
+ http://www.debian.org/security/2006/dsa-1244 (CVE-2006-6172)
+ * patches/mplayer-04-cabac-asm.diff: disable some asm stuff in
+ cabac.h that doesn't seem to compile on Solaris, use C instead
+ * patches/sqlite3-01-thread-lock-test.diff: rename to
+ sqlite-01-thread-lock-test.diff
+ * patches/pycurl-01-source-opts.diff: patch taken from pycurl
+ CVS HEAD needed for compiling with curl 7.16.0
+
2007-01-03 Damien Carbery <[email protected]>
* SFEglibmm.spec: Bump to 2.12.4.
@@ -6,11 +45,11 @@
* SFElibcaca.spec (new) A colour ASCII art library.
* SFElibrsync.spec (new) Library for generating network deltas
- * SFEgnucfengine.spec (new) A tool for administering networks of diverse
- machines
+ * SFEgnucfengine.spec (new) A tool for administering networks of
+ diverse machines
* SFElibgpg-error.spec: (removed) not needed; A SUNW version is already
in JDS
- * SFEgpgme.spec: Fix: Should depend on the SUNW version of libgpg-error.
+ * SFEgpgme.spec: Fix: Should depend on the SUNW version of libgpg-error
2006-12-20 Eric Boutilier <[email protected]>
@@ -50,8 +89,8 @@
* SFEbogofilter.spec: (new) A Bayesian spam filter
* SFEchmlib.spec: (new) A library for reading Microsoft .CHM files
- * SFElibevent.spec: (new) An event notification library for event-driven
- network servers
+ * SFElibevent.spec: (new) An event notification library for
+ event-driven network servers
* SFEtcpdump.spec: (new) Dump/print network traffic
* SFEwebalizer.spec: (new) Web server log analysis program
--- a/SFEbeagle.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEbeagle.spec Thu Jan 04 02:03:16 2007 +0000
@@ -18,12 +18,12 @@
BuildRequires: SFEmono-devel
BuildRequires: SFEgtk-sharp
BuildRequires: SFEgmime-devel
-BuildRequires: SFEsqlite3-devel
+BuildRequires: SFEsqlite-devel
Requires: %name-root
Requires: SFEmono
Requires: SFEgtk-sharp
Requires: SFEgmime
-Requires: SFEsqlite3
+Requires: SFEsqlite
%package root
Summary: %{summary} - / filesystem
--- a/SFEbzr.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEbzr.spec Thu Jan 04 02:03:16 2007 +0000
@@ -11,16 +11,16 @@
Summary: Bazaar Source Code Management System
License: GPL
Group: system/dscm
-Version: 0.6.2
-Release: 1
+Version: 0.13
+%define tarball_version 0.13rc1
Distribution: spec-files-extra
Vendor: http://pkgbuild.sf.net/spec-files-extra
-Source: http://www.bazaar-ng.org/pkg/bzr-%{version}.tar.gz
-URL: http://www.bazaar-ng.org
+Source: http://bazaar-vcs.org/releases/src/bzr-%{tarball_version}.tar.gz
+URL: http://bazaar-vcs.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
SUNW_BaseDir: %{_prefix}
Requires: SUNWPython
-Requires: SUNWcsu
+%include default-depend.inc
BuildRequires: SUNWPython-devel
@@ -28,7 +28,7 @@
Bazaar source code management system.
%prep
-%setup -q -n bzr-%{version}
+%setup -q -n bzr-%{tarball_version}
%build
export PYTHON="/usr/bin/python"
@@ -36,12 +36,15 @@
python setup.py build
%install
+rm -rf $RPM_BUILD_ROOT
python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages \
$RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
-# Delete precompiled py code (*.pyc). May not be compatibile with dest system.
-find $RPM_BUILD_ROOT%{_prefix} -type f -name "*.pyc" -exec rm -f {} ';'
+# Delete optimized py code
+find $RPM_BUILD_ROOT%{_prefix} -type f -name "*.pyo" -exec rm -f {} ';'
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_mandir}
%clean
@@ -55,8 +58,12 @@
%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}
%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}/vendor-packages
%{_libdir}/python%{python_version}/vendor-packages/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_mandir}/man1/bzr.1
%changelog
+* Wed Jan 3 2007 - [email protected]
+- bump to 0.13
* Mon Jun 12 2006 - [email protected]
- rename to SFEbzr
- change to root:bin to follow other JDS pkgs.
--- a/SFEcurl.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEcurl.spec Thu Jan 04 02:03:16 2007 +0000
@@ -8,7 +8,7 @@
Name: SFEcurl
Summary: curl - Get a file from FTP or HTTP server.
-Version: 7.15.3
+Version: 7.16.0
Source: http://curl.haxx.se/download/curl-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,6 +84,8 @@
%{_mandir}/man3/*
%changelog
+* Wed Jan 3 2006 - [email protected]
+- bump to 7.16.0
* Fri Jun 23 2006 - [email protected]
- rename to SFEcurl
- delete -share subpkg
--- a/SFEdevice-manager.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEdevice-manager.spec Thu Jan 04 02:03:16 2007 +0000
@@ -69,6 +69,7 @@
%files
%defattr(-, root, bin)
%{_bindir}/hal-device-manager
+%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/hal/device-manager/*
%if %build_l10n
@@ -79,8 +80,9 @@
%endif
%changelog
+* Wed Jan 3 2007 - [email protected]
+- fix %{_datadir} attributes
* Wed Dec 13 2006 - [email protected]
- L10n support added.
-
* Mon Dec 11 2006 - [email protected]
- Initial spec
--- a/SFEdvdauthor.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEdvdauthor.spec Thu Jan 04 02:03:16 2007 +0000
@@ -16,8 +16,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
Requires: SUNWlibC
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+Requires: SFElibdvdread
+BuildRequires: SFElibdvdread-devel
%prep
%setup -q -n dvdauthor-%version
--- a/SFEf-spot.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEf-spot.spec Thu Jan 04 02:03:16 2007 +0000
@@ -18,13 +18,13 @@
BuildRequires: SFEmono-devel
BuildRequires: SFElcms-devel
BuildRequires: SFEgtk-sharp
-BuildRequires: SFEsqlite3
-BuildRequires: SFEsqlite3-devel
+BuildRequires: SFEsqlite
+BuildRequires: SFEsqlite-devel
Requires: SUNWgnome-base-libs
Requires: SFEmono
Requires: SFElcms
Requires: SFEgtk-sharp
-Requires: SFEsqlite3
+Requires: SFEsqlite
Requires: SFEdbus-sharp
%if %build_l10n
--- a/SFEfileutils.spec Wed Jan 03 11:55:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-# Copyright 2006 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-%include Solaris.inc
-
-# This is a set of GNU versions of commands that are in /usr/bin,
-# so must relegate to /usr/gnu to avoid name collisions:
-
-%define _prefix %{_basedir}/gnu
-
-Name: SFEfileutils
-Summary: GNU fileutils
-Version: 4.1
-Source: ftp://ftp.gnu.org/pub/gnu/fileutils/fileutils-%{version}.tar.gz
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
-
-%prep
-%setup -q -n fileutils-%{version}
-
-%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-export LINGUAS="xx"
-%define _mandir %{_datadir}/man
-CFLAGS="$RPM_OPT_FLAGS -xc99" \
-./configure --prefix=%{_prefix} --mandir=%{_mandir}
-make -j$CPUS
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/*
-
-%changelog
-* Wed Nov 15 2006 <[email protected]>
-- Copied and transposed CBEfileutils to SFEfileutils
-* Tue Aug 22 2006 <[email protected]>
-- fix %files attributes
-- move to /opt/jdsbld by default
-* Wed Aug 16 2006 <[email protected]>
-- add missing deps
-* Tue Aug 1 2006 - [email protected]
-- add -xc99 (fix from Doug Scott)
-* Fri Sep 02 2004 <[email protected]>
-- remove unpackaged files
-* Sun Sep 05 2004 <[email protected]>
-- enable parallel build
-* Fri Mar 05 2004 <[email protected]>
-- fix %files
-- change the pkg category
--- a/SFEgajim.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEgajim.spec Thu Jan 04 02:03:16 2007 +0000
@@ -14,11 +14,11 @@
Patch1: gajim-01-build-fix.diff
%include default-depend.inc
Requires: SUNWPython
-Requires: SFEsqlite3
+Requires: SFEsqlite
Requires: SFEpysqlite
Requires: SFEgtkspell
BuildRequires: SUNWPython-devel
-BuildRequires: SFEsqlite3-devel
+BuildRequires: SFEsqlite-devel
BuildRequires: SFEpysqlite
BuildRequires: SFEgtkspell-devel
--- a/SFEliveMedia.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEliveMedia.spec Thu Jan 04 02:03:16 2007 +0000
@@ -7,14 +7,16 @@
Name: SFEliveMedia
Summary: liveMedia - live555 Streaming Media
-Version: 2006.12.08
+Version: 2006.12.31
Source: http://www.live555.com/liveMedia/public/live.%{version}.tar.gz
+Patch1: liveMedia-01-SOLARIS-macro.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
%prep
%setup -q -n live
+%patch1 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -39,6 +41,8 @@
%{_libdir}/*
%changelog
+* Wed Jan 3 2007 - [email protected]
+- bump to 2006.12.31, add patch SOLARIS-macro.diff
* Thu Dec 14 2006 - [email protected]
- Bump to 2006.12.08.
* Mon Nov 6 2006 - [email protected]
--- a/SFEmplayer.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEmplayer.spec Thu Jan 04 02:03:16 2007 +0000
@@ -10,8 +10,12 @@
Version: 1.0
%define tarball_version 1.0rc1
Source: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{tarball_version}.tar.bz2
+Patch1: mplayer-01-cddb.diff
+Patch2: mplayer-02-makefile-libfame-dep.diff
+Patch3: mplayer-03-asmrules_20061231.diff
+Patch4: mplayer-04-cabac-asm.diff
Source2: http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-20061022.tar.bz2
-Source3: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.6.tar.bz2
+Source3: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
Source4: http://www.mplayerhq.hu/MPlayer/skins/Abyss-1.6.tar.bz2
Source5: http://www.mplayerhq.hu/MPlayer/skins/neutron-1.5.tar.bz2
Source6: http://www.mplayerhq.hu/MPlayer/skins/proton-1.2.tar.bz2
@@ -64,6 +68,11 @@
%prep
%setup -q -n MPlayer-%tarball_version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
unzip %SOURCE7
unzip 26104-610_ANSI_C_source_code.zip
mv c-code libavcodec/amr_float
@@ -145,6 +154,10 @@
%{_datadir}/pixmaps/*
%changelog
+* Wed Jan 3 2007 - [email protected]
+- re-add patches cddb and makefile-libfame-dep after merging with 1.0rc1
+- add patches asmrules_20061231 (fixes a buffer overflow) and
+ cabac-asm (disables some asm stuff that doesn't seem to compile on Solaris.
* Wed Nov 29 2006 - [email protected]
- bump to 1.0rc1
* Tue Sep 26 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEpycurl.spec Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,58 @@
+#
+# spec file for package SFEpycurl
+#
+# includes module(s): pycurl
+#
+%include Solaris.inc
+
+%define python_version 2.4
+
+Name: SFEpycurl
+Summary: Python interface to libcurl
+License: LGPL
+Version: 7.15.5.1
+Source: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
+Patch1: pycurl-01-source-opts.diff
+URL: http://pycurl.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+SUNW_BaseDir: %{_prefix}
+Requires: SUNWPython
+%include default-depend.inc
+Requires: SFEcurl
+BuildRequires: SUNWPython-devel
+
+%prep
+%setup -q -n pycurl-%{version}
+%patch1 -p1
+
+%build
+export PYTHON="/usr/bin/python"
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/sfw/include"
+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
+python setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages \
+ $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+
+# Delete optimized py code.
+find $RPM_BUILD_ROOT%{_prefix} -type f -name "*.pyo" -exec rm -f {} ';'
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}/vendor-packages
+%{_libdir}/python%{python_version}/vendor-packages/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/pycurl
+
+%changelog
+* Wed Jan 3 2007 - [email protected]
+- create
--- a/SFEpysqlite.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEpysqlite.spec Thu Jan 04 02:03:16 2007 +0000
@@ -14,9 +14,9 @@
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: SUNWPython
-Requires: SFEsqlite3
+Requires: SFEsqlite
BuildRequires: SUNWPython-devel
-BuildRequires: SFEsqlite3-devel
+BuildRequires: SFEsqlite-devel
%include default-depend.inc
--- a/SFEseamonkey.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEseamonkey.spec Thu Jan 04 02:03:16 2007 +0000
@@ -8,7 +8,7 @@
Name: SFEseamonkey
Summary: seamonkey - all-in-one internet application suite
-Version: 1.0.4
+Version: 1.0.7
Source: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/seamonkey-%{version}.source.tar.bz2
URL: http://www.mozilla.org/projects/seamonkey/
SUNW_BaseDir: %{_basedir}
@@ -136,5 +136,7 @@
%{_includedir}/*
%changelog
+* Wed Jan 3 2007 - [email protected]
+- bump to 1.0.7
* Thu Aug 17 2006 - [email protected]
- created
--- a/SFEsqlite.spec Wed Jan 03 11:55:39 2007 +0000
+++ b/SFEsqlite.spec Thu Jan 04 02:03:16 2007 +0000
@@ -8,7 +8,7 @@
Summary: SQLite - a small C library implementation of a SQL database engine
Version: 3.3.8
Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
-Patch1: sqlite3-01-thread-lock-test.diff
+Patch1: sqlite-01-thread-lock-test.diff
URL: http://www.sqlite.org/
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--- a/SFExpdf.spec Wed Jan 03 11:55:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-# Because JDS has the gnome pdf viewer which is based on xpdf, there is
-# a little bit of overlap between that implementation and this one, however
-# IMO there are more than enough differences to justify offering a
-# separate spec file for ordinary xpdf.
-#
-# Copyright (c) 2006 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-
-%include Solaris.inc
-
-Name: SFExpdf
-Summary: Open source viewer for PDF files
-Version: 3.01
-Source: ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{version}.tar.gz
-
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
-
-BuildRequires: SUNWxwplt
-BuildRequires: SUNWxwxft
-
-Requires: SUNWxwplt
-Requires: SUNWxwxft
-
-%prep
-%setup -q -n xpdf-%version
-
-%build
-
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-export CFLAGS="%optflags -I/usr/sfw/include/freetype2 -I/usr/sfw/include"
-export CPPFLAGS="-I/usr/sfw/include -I/usr/sfw/include/freetype2"
-export CXXFLAGS="%cxx_optflags -I/usr/sfw/include/freetype2 -I/usr/sfw/include"
-export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib"
-
-# The source hard-codes (in GlobalParams.cc) a list of directories to
-# scan for ghostscript fonts; unfortunately it still doesn't find them on
-# OpenSolaris. The following on-the-fly patch fixes that. Alternatively
-# one can specify font locations in $HOME/.xpdfrc. A template .xpdfrc is
-# in doc/sample-xpdfrc (in the source distribution).
-
-perl -i.orig -lpe 's/local/sfw/ if m|/usr/local/share/ghostscript/fonts|' xpdf/GlobalParams.cc
-
-./configure --prefix=%{_prefix} \
- --mandir=%{_mandir} \
-
-make -j$CPUS
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Omit the etc/xpdfrc file from this package because SUNWgnome-pdf-viewer
-# (which is based on xpdf) already installs it. However, see the comments
-# above about using $HOME/.xpdfrc.
-
-rm $RPM_BUILD_ROOT/usr/etc/xpdfrc
-rmdir $RPM_BUILD_ROOT/usr/etc
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, bin) %{_mandir}
-%dir %attr (0755, root, bin) %{_mandir}/man?
-%{_mandir}/man?/*
-
-%changelog
-*
-* Tue Nov 14 2006 - Eric Boutilier
-- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/liveMedia-01-SOLARIS-macro.diff Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,11 @@
+--- live/groupsock/include/NetCommon.h.orig 2007-01-03 13:10:10.147171000 -0500
++++ live/groupsock/include/NetCommon.h 2007-01-03 13:11:04.200472000 -0500
+@@ -83,7 +83,7 @@
+
+ #define closeSocket close
+
+-#ifdef SOLARIS
++#if defined(__sun) && defined(__SVR4)
+ #define u_int64_t uint64_t
+ #define u_int32_t uint32_t
+ #define u_int16_t uint16_t
--- a/patches/mplayer-01-cddb.diff Wed Jan 03 11:55:39 2007 +0000
+++ b/patches/mplayer-01-cddb.diff Thu Jan 04 02:03:16 2007 +0000
@@ -1,21 +1,22 @@
-diff -urN MPlayer-1.0pre8-orig/libmpdemux/cddb.c MPlayer-1.0pre8/libmpdemux/cddb.c
---- MPlayer-1.0pre8-orig/libmpdemux/cddb.c 2006-06-12 01:35:46.000000000 +0700
-+++ MPlayer-1.0pre8/libmpdemux/cddb.c 2006-06-13 12:04:34.644502751 +0700
-@@ -43,7 +43,7 @@
+--- MPlayer-1.0rc1/stream/stream_cddb.c.orig 2007-01-03 13:34:17.708540000 -0500
++++ MPlayer-1.0rc1/stream/stream_cddb.c 2007-01-03 13:35:36.578649000 -0500
+@@ -41,7 +41,7 @@
#if defined(__linux__)
#include <linux/cdrom.h>
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(SOLARIS)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || (defined(__sun) && defined(__SVR4))
#include <sys/cdio.h>
#elif defined(WIN32)
#include <ddk/ntddcdrm.h>
-@@ -64,7 +64,7 @@
+@@ -62,7 +62,7 @@
static cd_toc_t cdtoc[100];
static int cdtoc_last_track;
-#if defined(__linux__) || defined(__bsdi__)
-+#if defined(__linux__) || defined(__bsdi__) || defined(SOLARIS)
++#if defined(__linux__) || defined(__bsdi__) || (defined (__sun) && defined (__SVR4))
int
read_toc(const char *dev) {
int drive;
+
+
--- a/patches/mplayer-02-makefile-libfame-dep.diff Wed Jan 03 11:55:39 2007 +0000
+++ b/patches/mplayer-02-makefile-libfame-dep.diff Thu Jan 04 02:03:16 2007 +0000
@@ -1,34 +1,22 @@
-diff -urN MPlayer-1.0pre8-orig/Makefile MPlayer-1.0pre8/Makefile
---- MPlayer-1.0pre8-orig/Makefile 2006-06-12 01:35:47.000000000 +0700
-+++ MPlayer-1.0pre8/Makefile 2006-06-13 12:02:50.172762271 +0700
-@@ -247,7 +247,7 @@
+--- MPlayer-1.0rc1/Makefile.orig 2007-01-03 13:29:54.739249000 -0500
++++ MPlayer-1.0rc1/Makefile 2007-01-03 13:30:15.197044000 -0500
+@@ -245,7 +245,7 @@
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
endif
ifeq ($(FAME),yes)
-COMMON_DEPS += libfame/libfame.a
-+COMMON_DEPS += -lfame
++#COMMON_DEPS += libfame/libfame.a
endif
ifeq ($(DVDKIT2),yes)
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
-@@ -276,9 +276,6 @@
- loader/libloader.a:
- $(MAKE) -C loader
-
--libfame/libfame.a:
-- $(MAKE) -C libfame
--
- libmpdemux/libmpdemux.a:
- $(MAKE) -C libmpdemux
-
-diff -urN MPlayer-1.0pre8-orig/configure MPlayer-1.0pre8/configure
---- MPlayer-1.0pre8-orig/configure 2006-06-12 01:35:47.000000000 +0700
-+++ MPlayer-1.0pre8/configure 2006-06-13 11:59:27.095129640 +0700
-@@ -4732,7 +4732,7 @@
- _def_fame='#undef USE_LIBFAME'
- if test "$_fame" = yes ; then
- _def_fame='#define USE_LIBFAME 1'
-- _ld_fame='libfame/libfame.a'
-+ _ld_fame='-lfame'
+--- MPlayer-1.0rc1/configure.orig 2007-01-03 13:36:32.693020000 -0500
++++ MPlayer-1.0rc1/configure 2007-01-03 13:36:58.903012000 -0500
+@@ -4762,7 +4762,7 @@
+ _def_libfame='#undef USE_LIBFAME'
+ if test "$_libfame" = yes ; then
+ _def_libfame='#define USE_LIBFAME 1'
+- _ld_libfame='libfame/libfame.a'
++ _ld_libfame='-lfame -lmp3lame'
fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mplayer-03-asmrules_20061231.diff Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,51 @@
+Index: MPlayer-1.0rc1/stream/realrtsp/asmrp.c
+===================================================================
+--- MPlayer-1.0rc1/stream/realrtsp/asmrp.c (revision 20381)
++++ MPlayer-1.0rc1/stream/realrtsp/asmrp.c (working copy)
+@@ -40,6 +40,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "asmrp.h"
+
+ /*
+ #define LOG
+@@ -645,8 +646,10 @@
+ #ifdef LOG
+ printf ("rule #%d is true\n", rule_num);
+ #endif
+- matches[num_matches] = rule_num;
+- num_matches++;
++ if(num_matches < MAX_RULEMATCHES - 1)
++ matches[num_matches++] = rule_num;
++ else
++ printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
+ }
+
+ rule_num++;
+Index: MPlayer-1.0rc1/stream/realrtsp/real.c
+===================================================================
+--- MPlayer-1.0rc1/stream/realrtsp/real.c (revision 20381)
++++ MPlayer-1.0rc1/stream/realrtsp/real.c (working copy)
+@@ -271,7 +271,7 @@
+ int j=0;
+ int n;
+ char b[64];
+- int rulematches[16];
++ int rulematches[MAX_RULEMATCHES];
+
+ #ifdef LOG
+ printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
+Index: MPlayer-1.0rc1/stream/realrtsp/asmrp.h
+===================================================================
+--- MPlayer-1.0rc1/stream/realrtsp/asmrp.h (revision 20381)
++++ MPlayer-1.0rc1/stream/realrtsp/asmrp.h (working copy)
+@@ -40,6 +40,8 @@
+ #ifndef HAVE_ASMRP_H
+ #define HAVE_ASMRP_H
+
++#define MAX_RULEMATCHES 16
++
+ int asmrp_match (const char *rules, int bandwidth, int *matches) ;
+
+ #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mplayer-04-cabac-asm.diff Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,12 @@
+--- MPlayer-1.0rc1/libavcodec/cabac.h.orig 2007-01-03 12:46:37.138932000 -0500
++++ MPlayer-1.0rc1/libavcodec/cabac.h 2007-01-03 12:47:00.866583000 -0500
+@@ -33,6 +33,7 @@
+ #define CABAC_MASK ((1<<CABAC_BITS)-1)
+ #define BRANCHLESS_CABAC_DECODER 1
+ //#define ARCH_X86_DISABLED 1
++#undef ARCH_X86
+
+ typedef struct CABACContext{
+ int low;
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pycurl-01-source-opts.diff Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,84 @@
+--- pycurl/src/pycurl.c 2006/08/11 10:37:19 1.116
++++ pycurl/src/pycurl.c 2006/11/07 15:14:11 1.117
+@@ -1,4 +1,4 @@
+-/* $Id: pycurl.c,v 1.116 2006/08/11 10:37:19 kjetilja Exp $ */
++/* $Id: pycurl.c,v 1.117 2006/11/07 15:14:11 kjetilja Exp $ */
+
+ /* PycURL -- cURL Python module
+ *
+@@ -48,8 +48,8 @@
+ #if !defined(PY_VERSION_HEX) || (PY_VERSION_HEX < 0x02020000)
+ # error "Need Python version 2.2 or greater to compile pycurl."
+ #endif
+-#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f05)
+-# error "Need libcurl version 7.15.5 or greater to compile pycurl."
++#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x071000)
++# error "Need libcurl version 7.16.0 or greater to compile pycurl."
+ #endif
+
+ #undef UNUSED
+@@ -132,8 +132,6 @@
+ struct curl_slist *quote;
+ struct curl_slist *postquote;
+ struct curl_slist *prequote;
+- struct curl_slist *source_prequote;
+- struct curl_slist *source_postquote;
+ /* callbacks */
+ PyObject *w_cb;
+ PyObject *h_cb;
+@@ -669,8 +667,6 @@
+ self->quote = NULL;
+ self->postquote = NULL;
+ self->prequote = NULL;
+- self->source_postquote = NULL;
+- self->source_prequote = NULL;
+
+ /* Set callback pointers to NULL by default */
+ self->w_cb = NULL;
+@@ -860,8 +856,6 @@
+ SFREE(self->quote);
+ SFREE(self->postquote);
+ SFREE(self->prequote);
+- SFREE(self->source_postquote);
+- SFREE(self->source_prequote);
+ #undef SFREE
+
+ /* Last, free the options. This must be done after the curl handle
+@@ -1475,9 +1469,6 @@
+ case CURLOPT_URL:
+ case CURLOPT_USERAGENT:
+ case CURLOPT_USERPWD:
+- case CURLOPT_SOURCE_HOST:
+- case CURLOPT_SOURCE_USERPWD:
+- case CURLOPT_SOURCE_PATH:
+ case CURLOPT_FTP_ALTERNATIVE_TO_USER:
+ /* FIXME: check if more of these options allow binary data */
+ str = PyString_AsString_NoNUL(obj);
+@@ -1646,12 +1637,6 @@
+ case CURLOPT_PREQUOTE:
+ old_slist = &self->prequote;
+ break;
+- case CURLOPT_SOURCE_PREQUOTE:
+- old_slist = &self->source_prequote;
+- break;
+- case CURLOPT_SOURCE_POSTQUOTE:
+- old_slist = &self->source_postquote;
+- break;
+ case CURLOPT_HTTPPOST:
+ break;
+ default:
+@@ -3180,14 +3165,9 @@
+ insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
+ insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
+ insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);
+- insint_c(d, "SOURCE_USERPWD", CURLOPT_SOURCE_USERPWD);
+- insint_c(d, "SOURCE_PREQUOTE", CURLOPT_SOURCE_PREQUOTE);
+- insint_c(d, "SOURCE_POSTQUOTE", CURLOPT_SOURCE_POSTQUOTE);
+ insint_c(d, "FTPSSLAUTH", CURLOPT_FTPSSLAUTH);
+ insint_c(d, "IOCTLFUNCTION", CURLOPT_IOCTLFUNCTION);
+ insint_c(d, "IOCTLDATA", CURLOPT_IOCTLDATA);
+- insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL);
+- insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE);
+ insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
+ insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
+ insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/sqlite-01-thread-lock-test.diff Thu Jan 04 02:03:16 2007 +0000
@@ -0,0 +1,20 @@
+--- sqlite-3.3.6/src/os_unix.c.orig 2006-07-25 10:02:58.005134000 -0400
++++ sqlite-3.3.6/src/os_unix.c 2006-07-25 10:05:16.861810000 -0400
+@@ -462,6 +462,9 @@
+ ** threadsOverrideEachOthersLocks variable appropriately.
+ */
+ static void testThreadLockingBehavior(int fd_orig){
++#if defined (sun) && defined (__SVR4)
++ threadsOverrideEachOthersLocks = 1;
++#else
+ int fd;
+ struct threadTestData d[2];
+ pthread_t t[2];
+@@ -482,6 +485,7 @@
+ pthread_join(t[1], 0);
+ close(fd);
+ threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0;
++#endif
+ }
+ #endif /* SQLITE_UNIX_THREADS */
+
--- a/patches/sqlite3-01-thread-lock-test.diff Wed Jan 03 11:55:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- sqlite-3.3.6/src/os_unix.c.orig 2006-07-25 10:02:58.005134000 -0400
-+++ sqlite-3.3.6/src/os_unix.c 2006-07-25 10:05:16.861810000 -0400
-@@ -462,6 +462,9 @@
- ** threadsOverrideEachOthersLocks variable appropriately.
- */
- static void testThreadLockingBehavior(int fd_orig){
-+#if defined (sun) && defined (__SVR4)
-+ threadsOverrideEachOthersLocks = 1;
-+#else
- int fd;
- struct threadTestData d[2];
- pthread_t t[2];
-@@ -482,6 +485,7 @@
- pthread_join(t[1], 0);
- close(fd);
- threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0;
-+#endif
- }
- #endif /* SQLITE_UNIX_THREADS */
-