Menu
▾
▴
pkgbuild-sfe-commits — svn commit notifications for the spec-files-extra module
You can subscribe to this list here.
| 2007 |
Jan
(44) |
Feb
(22) |
Mar
(62) |
Apr
(47) |
May
(26) |
Jun
(27) |
Jul
(45) |
Aug
(68) |
Sep
(81) |
Oct
(95) |
Nov
(85) |
Dec
(56) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(104) |
Feb
(89) |
Mar
(73) |
Apr
(53) |
May
(97) |
Jun
(70) |
Jul
(22) |
Aug
(68) |
Sep
(50) |
Oct
(71) |
Nov
(60) |
Dec
(69) |
| 2009 |
Jan
(60) |
Feb
(49) |
Mar
(73) |
Apr
(65) |
May
(48) |
Jun
(44) |
Jul
(61) |
Aug
(138) |
Sep
(52) |
Oct
(38) |
Nov
(26) |
Dec
(14) |
| 2010 |
Jan
(55) |
Feb
(29) |
Mar
(107) |
Apr
(99) |
May
(166) |
Jun
(97) |
Jul
(35) |
Aug
(44) |
Sep
(37) |
Oct
(51) |
Nov
(55) |
Dec
(38) |
| 2011 |
Jan
(52) |
Feb
(96) |
Mar
(163) |
Apr
(40) |
May
(28) |
Jun
(100) |
Jul
(93) |
Aug
(83) |
Sep
(61) |
Oct
(172) |
Nov
(83) |
Dec
(119) |
| 2012 |
Jan
(60) |
Feb
(146) |
Mar
(94) |
Apr
(113) |
May
(58) |
Jun
(109) |
Jul
(46) |
Aug
(125) |
Sep
(35) |
Oct
(37) |
Nov
(71) |
Dec
(46) |
| 2013 |
Jan
(84) |
Feb
(94) |
Mar
(26) |
Apr
(11) |
May
(6) |
Jun
(18) |
Jul
(7) |
Aug
(13) |
Sep
(108) |
Oct
(38) |
Nov
(85) |
Dec
(36) |
| 2014 |
Jan
(46) |
Feb
(42) |
Mar
(24) |
Apr
(23) |
May
(15) |
Jun
(13) |
Jul
(8) |
Aug
(13) |
Sep
|
Oct
(6) |
Nov
(4) |
Dec
(9) |
| 2015 |
Jan
(49) |
Feb
(16) |
Mar
(14) |
Apr
(10) |
May
(10) |
Jun
(19) |
Jul
(4) |
Aug
(69) |
Sep
(12) |
Oct
(23) |
Nov
(15) |
Dec
(26) |
| 2016 |
Jan
(63) |
Feb
(39) |
Mar
(39) |
Apr
(26) |
May
(19) |
Jun
(12) |
Jul
(7) |
Aug
(5) |
Sep
(27) |
Oct
(20) |
Nov
(20) |
Dec
(22) |
| 2017 |
Jan
(6) |
Feb
(14) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(10) |
Jul
(10) |
Aug
(5) |
Sep
(6) |
Oct
(13) |
Nov
(25) |
Dec
(19) |
| 2018 |
Jan
(28) |
Feb
|
Mar
(1) |
Apr
(6) |
May
(2) |
Jun
(6) |
Jul
(1) |
Aug
(8) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(7) |
| 2019 |
Jan
(12) |
Feb
(7) |
Mar
(26) |
Apr
(20) |
May
(3) |
Jun
(7) |
Jul
(17) |
Aug
(6) |
Sep
(6) |
Oct
(2) |
Nov
(6) |
Dec
(7) |
| 2020 |
Jan
(2) |
Feb
(5) |
Mar
(4) |
Apr
|
May
(4) |
Jun
(12) |
Jul
(2) |
Aug
(5) |
Sep
(4) |
Oct
(3) |
Nov
(7) |
Dec
(2) |
| 2021 |
Jan
(3) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
(4) |
Nov
(2) |
Dec
(1) |
| 2022 |
Jan
(13) |
Feb
(15) |
Mar
(1) |
Apr
(5) |
May
(4) |
Jun
(4) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(29) |
Nov
(13) |
Dec
(1) |
| 2023 |
Jan
(18) |
Feb
(30) |
Mar
(56) |
Apr
(20) |
May
(6) |
Jun
(3) |
Jul
(7) |
Aug
(1) |
Sep
(1) |
Oct
(12) |
Nov
(13) |
Dec
(8) |
| 2024 |
Jan
(7) |
Feb
(10) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <yi...@us...> - 2008-10-01 19:36:45
|
Revision: 1407
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1407&view=rev
Author: yippi
Date: 2008-10-01 19:36:32 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
2008-10-02 Brian Cameron <bri...@su...>
* SFEpython-cssutils.spec: Fix packaging so the easy-install.pth
issue mentioned in my last mail is addressed.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEpython-cssutils.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-10-01 14:15:14 UTC (rev 1406)
+++ spec-files-extra/trunk/ChangeLog 2008-10-01 19:36:32 UTC (rev 1407)
@@ -1,6 +1,12 @@
+2008-10-02 Brian Cameron <bri...@su...>
+
+ * SFEpython-cssutils.spec: Fix packaging so the easy-install.pth
+ issue mentioned in my last mail is addressed.
+
2008-10-02 Mark Wright <mar...@in...>
- * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
+ * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump
+ patch1
* SFEemacs.spec: Bump to 22.3
* SFElibetpan.spec: *NEW* email library
* SFEgnupg2.spec: Patch 3 and 4 to correct build issues on sol10
@@ -86,6 +92,7 @@
* patches/gdm-07-gconfsanity.diff: Fix for gconf-sanity-check warning.
2008-09-21 Dick Hoogendijk <di...@na...>
+
* SFEqt.spec: Bump to version 4.4.2
2008-09-19 Jerry Yu <jij...@su...>
Modified: spec-files-extra/trunk/SFEpython-cssutils.spec
===================================================================
--- spec-files-extra/trunk/SFEpython-cssutils.spec 2008-10-01 14:15:14 UTC (rev 1406)
+++ spec-files-extra/trunk/SFEpython-cssutils.spec 2008-10-01 19:36:32 UTC (rev 1407)
@@ -35,13 +35,8 @@
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/
export PYTHONPATH=$PYTHONPATH:$RPM_BUILD_ROOT/%_prefix/lib/python%{pythonver}/site-packages
-python setup.py install --prefix=$RPM_BUILD_ROOT/%_prefix
+python setup.py install --root=$RPM_BUILD_ROOT
-# Remove files we don't need.
-rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/easy-install.pth
-rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/site.py
-rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/site.pyc
-
# move to vendor-packages
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
@@ -59,8 +54,10 @@
%{_bindir}/cssparse
%{_bindir}/csscapture
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/cssutils*.egg
-#%{_libdir}/python%{pythonver}/vendor-packages/easy-install.pth
+%{_libdir}/python%{pythonver}/vendor-packages/cssutils-%{version}-py%{pythonver}.egg-info
+%{_libdir}/python%{pythonver}/vendor-packages/cssutils
+%{_libdir}/python%{pythonver}/vendor-packages/encutils
+%{_libdir}/python%{pythonver}/vendor-packages/tests
%changelog
* Thu Sep 18 2008 - jij...@su...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-10-01 14:15:43
|
Revision: 1406
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1406&view=rev
Author: markwright
Date: 2008-10-01 14:15:14 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
* SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
* SFEemacs.spec: Bump to 22.3
* SFElibetpan.spec: *NEW* email library
* SFEgnupg2.spec: Patch 3 and 4 to correct build issues on sol10
* patches/gnupg2-03-jnlib-Makefile.diff: Patch from KDE4 project
* patches/gnupg2-04-keyserver-sm-Makefile.diff: Patch from KDE4 project
* SFElibpcap.spec: Bump to 0.9.8
* SFEgnochm.spec: Bump to 0.9.11
* SFEclaws-mail.spec *NEW* GTK+ email client.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEdeluge.spec
spec-files-extra/trunk/SFEemacs.spec
spec-files-extra/trunk/SFEgnochm.spec
spec-files-extra/trunk/SFEgnupg2.spec
spec-files-extra/trunk/SFElibpcap.spec
spec-files-extra/trunk/patches/deluge-01-sunpro.diff
Added Paths:
-----------
spec-files-extra/trunk/SFEclaws-mail.spec
spec-files-extra/trunk/SFElibetpan.spec
spec-files-extra/trunk/patches/gnupg2-03-jnlib-Makefile.diff
spec-files-extra/trunk/patches/gnupg2-04-keyserver-sm-Makefile.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/ChangeLog 2008-10-01 14:15:14 UTC (rev 1406)
@@ -1,3 +1,15 @@
+2008-10-02 Mark Wright <mar...@in...>
+
+ * SFEdeluge.spec, patches/deluge-01-sunpro.diff: Bump to 0.5.9.1, bump patch1
+ * SFEemacs.spec: Bump to 22.3
+ * SFElibetpan.spec: *NEW* email library
+ * SFEgnupg2.spec: Patch 3 and 4 to correct build issues on sol10
+ * patches/gnupg2-03-jnlib-Makefile.diff: Patch from KDE4 project
+ * patches/gnupg2-04-keyserver-sm-Makefile.diff: Patch from KDE4 project
+ * SFElibpcap.spec: Bump to 0.9.8
+ * SFEgnochm.spec: Bump to 0.9.11
+ * SFEclaws-mail.spec *NEW* GTK+ email client.
+
2008-09-30 Brian Cameron <bri...@su...>
* SFEelisa-plugins-bad.spec, patches/elisa-plugins-bad-nohashlib.diff:
Added: spec-files-extra/trunk/SFEclaws-mail.spec
===================================================================
--- spec-files-extra/trunk/SFEclaws-mail.spec (rev 0)
+++ spec-files-extra/trunk/SFEclaws-mail.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -0,0 +1,136 @@
+#
+# spec file for package SUNWclaws-mail
+#
+
+%include Solaris.inc
+
+%include base.inc
+
+%define src_name claws-mail
+
+
+Name: SFEclaws-mail
+Summary: Claws-Mail is an e-mail client (and news reader) based on GTK+
+Version: 3.5.0
+Source: %{sf_download}/sylpheed-claws/%{src_name}-%{version}.tar.bz2
+License: GPL
+URL: http://claws-mail.org/
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWopenssl-include
+BuildRequires: SFEaspell-devel
+BuildRequires: SFElibetpan-devel
+Requires: SUNWlibmsr
+Requires: SUNWgnome-base-libs
+Requires: SUNWopenssl-libraries
+Requires: SFEpth
+Requires: SFElibassuan
+Requires: SFEgnupg2
+Requires: SFEaspell
+Requires: SFEdillo
+Requires: SFEbogofilter
+Requires: SFElibetpan
+
+
+%description
+Claws-Mail is an e-mail client (and news reader) based on GTK+
+
+%prep
+%setup -q -n %{src_name}-%{version}
+sed -i -e "s,CFLAGS -Wall,CFLAGS,g" configure configure.ac
+
+%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 -xc99"
+export LDFLAGS="%_ldflags -lsocket -lnsl"
+
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static \
+ --disable-ldap
+
+make -j $CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=${RPM_BUILD_ROOT} install
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+install -m 644 *.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+rm ${RPM_BUILD_ROOT}%{_bindir}/sylpheed-claws
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/%{src_name}
+
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/claws-mail
+%dir %attr (0755, root, other) %{_libdir}/claws-mail/plugins
+%{_libdir}/claws-mail/plugins/*
+%dir %attr (0755, root, sys) %{_datadir}
+%defattr (-, root, other)
+%dir %attr (0755, root, other) %{_datadir}/doc
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/manual
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/manual/en
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/manual/es
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/manual/fr
+%dir %attr (0755, root, other) %{_datadir}/doc/%{src_name}/manual/pl
+%{_datadir}/doc/%{src_name}/RELEASE_NOTES
+%{_datadir}/doc/%{src_name}/manual/en/*
+%{_datadir}/doc/%{src_name}/manual/es/*
+%{_datadir}/doc/%{src_name}/manual/fr/*
+%{_datadir}/doc/%{src_name}/manual/pl/*
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/48x48/apps/claws-mail.png
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/*.png
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%dir %attr (0755, root, bin) %{_datadir}/man
+%dir %attr (0755, root, bin) %{_datadir}/man/man1
+%{_datadir}/man/man1/claws-mail.1
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/claws-mail.pc
+%dir %attr (0755, root, bin) %{_includedir}
+%dir %attr (0755, root, bin) %{_includedir}/claws-mail
+%dir %attr (0755, root, bin) %{_includedir}/claws-mail/common
+%dir %attr (0755, root, bin) %{_includedir}/claws-mail/gtk
+%dir %attr (0755, root, bin) %{_includedir}/claws-mail/etpan
+%{_includedir}/claws-mail/*.h
+%{_includedir}/claws-mail/common/*.h
+%{_includedir}/claws-mail/gtk/*.h
+%{_includedir}/claws-mail/etpan/*.h
+
+%changelog
+* Thu Oct 2 2008 - mar...@in...
+- create
Modified: spec-files-extra/trunk/SFEdeluge.spec
===================================================================
--- spec-files-extra/trunk/SFEdeluge.spec 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/SFEdeluge.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -7,7 +7,7 @@
Name: SFEdeluge
Summary: Deluge - BitTorrent client
-Version: 0.5.8.7
+Version: 0.5.9.1
Source: http://download.deluge-torrent.org/source/%{version}/deluge-%{version}.tar.gz
Patch1: deluge-01-sunpro.diff
#Patch2: deluge-02-path.diff
@@ -168,6 +168,8 @@
%endif
%changelog
+* Thu Oct 2 2008 - mar...@in...
+- Bump to 0.5.9.1, bump patch1
* Thu Mar 27 2008 - tr...@ac...
- Bump to 0.5.8.7, bump patch4
* Wed Mar 26 2008 - tr...@ac...
Modified: spec-files-extra/trunk/SFEemacs.spec
===================================================================
--- spec-files-extra/trunk/SFEemacs.spec 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/SFEemacs.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -7,8 +7,8 @@
Name: SFEemacs
Summary: GNU Emacs - an operating system in a text editor
-Version: 22.1
-%define emacs_version 22.1
+Version: 22.3
+%define emacs_version 22.3
Source: http://ftp.gnu.org/pub/gnu/emacs/emacs-%{emacs_version}.tar.gz
URL: http://www.gnu.org/software/emacs/emacs.html
SUNW_BaseDir: %{_basedir}
@@ -123,6 +123,8 @@
%{_localstatedir}/games/emacs/*
%changelog
+* Thu Oct 2 2008 - mar...@in...
+- Bump to 22.3
* Wed Oct 17 2007 - la...@su...
- change /var/games owner to root:bin to match Maelstrom
* Tue Oct 16 2007 - la...@su...
Modified: spec-files-extra/trunk/SFEgnochm.spec
===================================================================
--- spec-files-extra/trunk/SFEgnochm.spec 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/SFEgnochm.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -10,7 +10,7 @@
Name: SFEgnochm
Summary: Gnome CHM viewer
-Version: 0.9.10
+Version: 0.9.11
Source: %{src_url}/%{src_name}-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -142,6 +142,8 @@
%{_sysconfdir}
%changelog
+* Wed Oct 1 2008 - mar...@in...
+- Bump to 0.9.11
* Mon Apr 07 2008 - bri...@su...
- Change SFEgnome-python-extras to SUNWgnome-python-extras
* Fri Jul 27 2007 - do...@tr...
Modified: spec-files-extra/trunk/SFEgnupg2.spec
===================================================================
--- spec-files-extra/trunk/SFEgnupg2.spec 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/SFEgnupg2.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -13,6 +13,8 @@
Version: %{gnupg.version}
Patch1: gnupg2-01-asschk.diff
Patch2: gnupg2-02-inittests.diff
+Patch3: gnupg2-03-jnlib-Makefile.diff
+Patch4: gnupg2-04-keyserver-sm-Makefile.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -41,6 +43,8 @@
cd %name-%version
%patch1 -p0
%patch2 -p0
+%patch3 -p0
+%patch4 -p0
cd ..
%build
@@ -99,6 +103,8 @@
%endif
%changelog
+* Thu Oct 2 2008 - mar...@in...
+- Add patch 3 and 4 from KDE4 project to fix build issues on sol10
* Sun Jan 20 2008 - moi...@su...
- Fixed various nits.
- Fixed build using SUN Studio.
Added: spec-files-extra/trunk/SFElibetpan.spec
===================================================================
--- spec-files-extra/trunk/SFElibetpan.spec (rev 0)
+++ spec-files-extra/trunk/SFElibetpan.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -0,0 +1,63 @@
+#
+# spec file for package SFElibetpan
+#
+# includes module(s): libetpan
+#
+%include Solaris.inc
+
+Name: SFElibetpan
+Summary: libetpan - mail library
+Version: 0.56
+Source: %{sf_download}/libetpan/libetpan-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+buildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+
+%prep
+%setup -q -n libetpan-%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"
+export LDFLAGS="%_ldflags -lsocket -lnsl"
+
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/libetpan-config
+
+%changelog
+* Thu Oct 2 2008 - mar...@in...
+- create
Modified: spec-files-extra/trunk/SFElibpcap.spec
===================================================================
--- spec-files-extra/trunk/SFElibpcap.spec 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/SFElibpcap.spec 2008-10-01 14:15:14 UTC (rev 1406)
@@ -7,7 +7,7 @@
Name: SFElibpcap
Summary: Packet Capture library
-Version: 0.9.7
+Version: 0.9.8
Source: http://www.tcpdump.org/release/libpcap-%{version}.tar.gz
Patch1: libpcap-01-link-shared-lib.diff
SUNW_BaseDir: %{_basedir}
@@ -67,6 +67,8 @@
%{_mandir}/man3/pcap.3
%changelog
+* Thu Oct 2 2008 - mar...@in...
+- 0.9.8
* Wed May 7 2008 - ri...@wi...
- 0.9.7
* Tue Apr 3 2007 - la...@su...
Modified: spec-files-extra/trunk/patches/deluge-01-sunpro.diff
===================================================================
--- spec-files-extra/trunk/patches/deluge-01-sunpro.diff 2008-10-01 06:20:29 UTC (rev 1405)
+++ spec-files-extra/trunk/patches/deluge-01-sunpro.diff 2008-10-01 14:15:14 UTC (rev 1406)
@@ -1,5 +1,5 @@
---- deluge-torrent-0.5.8.5.orig/setup.py 2008-02-28 01:54:06.000000000 -0500
-+++ deluge-torrent-0.5.8.5/setup.py 2008-03-02 22:44:23.914991996 -0500
+--- deluge-torrent-0.5.9.1-orig/setup.py 2008-05-19 01:44:59.000000000 +0000
++++ deluge-torrent-0.5.9.1/setup.py 2008-06-19 16:36:05.997302854 +0000
@@ -98,12 +98,12 @@
# it has been removed to prevent confusion.
@@ -49,8 +49,8 @@
# Thanks to Iain Nicol for code to save the location for installed prefix
# At runtime, we need to know where we installed the data to.
---- deluge-torrent-0.5.8.4-orig/libtorrent/include/libtorrent/xml_parse.hpp 2008-02-13 05:40:56.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/include/libtorrent/xml_parse.hpp 2008-02-26 00:15:48.615818630 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/include/libtorrent/xml_parse.hpp 2008-05-11 23:55:17.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/include/libtorrent/xml_parse.hpp 2008-06-19 16:36:05.997593489 +0000
@@ -128,7 +128,7 @@
*(p-1) = '?';
tag_end = p - 1;
@@ -60,8 +60,8 @@
{
start += 3;
*(p-2) = 0;
---- deluge-torrent-0.5.8.4-orig/libtorrent/include/libtorrent/asio/detail/socket_ops.hpp 2008-02-13 01:02:31.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/include/libtorrent/asio/detail/socket_ops.hpp 2008-02-26 00:15:48.617570506 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/include/libtorrent/asio/detail/socket_ops.hpp 2008-05-11 23:55:17.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/include/libtorrent/asio/detail/socket_ops.hpp 2008-06-19 16:36:05.998558743 +0000
@@ -197,7 +197,10 @@
#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
b.buf = static_cast<char*>(data);
@@ -86,8 +86,8 @@
b.iov_base = const_cast<void*>(data);
b.iov_len = size;
#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
---- deluge-torrent-0.5.8.4-orig/libtorrent/include/libtorrent/asio/impl/error_code.ipp 2008-02-13 01:02:30.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/include/libtorrent/asio/impl/error_code.ipp 2008-02-26 00:15:48.617979966 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/include/libtorrent/asio/impl/error_code.ipp 2008-05-11 23:55:16.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/include/libtorrent/asio/impl/error_code.ipp 2008-06-19 16:36:05.998828118 +0000
@@ -83,16 +83,16 @@
if (category() != error::get_system_category())
return "asio error";
@@ -108,8 +108,8 @@
#endif
#endif // defined(BOOST_WINDOWS)
}
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/http_stream.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/http_stream.cpp 2008-02-26 00:15:48.618350727 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/http_stream.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/http_stream.cpp 2008-06-19 16:36:05.999064910 +0000
@@ -130,7 +130,7 @@
if (found_end)
{
@@ -128,8 +128,8 @@
if (code != 200)
{
(*h)(asio::error::operation_not_supported);
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/piece_picker.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/piece_picker.cpp 2008-02-26 00:15:48.619341717 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/piece_picker.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/piece_picker.cpp 2008-06-19 16:36:05.999930124 +0000
@@ -536,7 +536,7 @@
{
// find a random position in the destination vector where we will place
@@ -157,8 +157,8 @@
// if we have suggested pieces, try to find one of those instead
for (std::vector<int>::const_iterator i = suggested_pieces.begin()
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/session.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/session.cpp 2008-02-26 00:15:48.619783468 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/session.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/session.cpp 2008-06-19 16:36:06.004093093 +0000
@@ -77,7 +77,6 @@
using boost::shared_ptr;
using boost::weak_ptr;
@@ -167,8 +167,8 @@
using libtorrent::aux::session_impl;
namespace libtorrent
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/session_impl.cpp 2008-02-13 08:50:18.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/session_impl.cpp 2008-02-26 00:15:48.621625280 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/session_impl.cpp 2008-05-18 22:37:11.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/session_impl.cpp 2008-06-19 16:36:06.005696187 +0000
@@ -98,7 +98,6 @@
using boost::shared_ptr;
using boost::weak_ptr;
@@ -240,7 +240,7 @@
TORRENT_ASSERT(!m_processing.empty());
processing.reset();
-@@ -763,7 +762,7 @@
+@@ -764,7 +763,7 @@
m_download_channel.close();
m_upload_channel.close();
@@ -249,7 +249,7 @@
// abort the checker thread
m_checker_impl.m_abort = true;
-@@ -1657,7 +1656,7 @@
+@@ -1669,7 +1668,7 @@
std::vector<torrent_handle> session_impl::get_torrents()
{
mutex_t::scoped_lock l(m_mutex);
@@ -258,7 +258,7 @@
std::vector<torrent_handle> ret;
for (std::deque<boost::shared_ptr<aux::piece_checker_data> >::iterator i
= m_checker_impl.m_torrents.begin()
-@@ -1709,7 +1708,7 @@
+@@ -1721,7 +1720,7 @@
// lock the session and the checker thread (the order is important!)
mutex_t::scoped_lock l(m_mutex);
@@ -267,7 +267,7 @@
// INVARIANT_CHECK;
-@@ -1785,7 +1784,7 @@
+@@ -1797,7 +1796,7 @@
TORRENT_ASSERT(!save_path.empty());
{
// lock the checker_thread
@@ -276,7 +276,7 @@
// is the torrent currently being checked?
if (m_checker_impl.find_torrent(info_hash))
-@@ -1885,7 +1884,7 @@
+@@ -1896,7 +1895,7 @@
if (h.m_chk)
{
@@ -285,7 +285,7 @@
aux::piece_checker_data* d = m_checker_impl.find_torrent(h.m_info_hash);
if (d != 0)
-@@ -2197,7 +2196,7 @@
+@@ -2208,7 +2207,7 @@
// destructed and then the invariant will be broken).
{
@@ -294,8 +294,8 @@
// abort the checker thread
m_checker_impl.m_abort = true;
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/sha1.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/sha1.cpp 2008-02-26 00:15:48.622323109 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/sha1.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/sha1.cpp 2008-06-19 16:36:06.006271345 +0000
@@ -20,20 +20,19 @@
// #include <stdint.h>
@@ -409,8 +409,8 @@
{
digest[i] = static_cast<unsigned char>(
(context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/torrent.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/torrent.cpp 2008-02-26 00:15:48.623892924 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/torrent.cpp 2008-05-18 22:37:11.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/torrent.cpp 2008-06-19 16:36:06.007867564 +0000
@@ -79,7 +79,6 @@
using boost::tuples::get;
using boost::tuples::make_tuple;
@@ -419,8 +419,8 @@
using libtorrent::aux::session_impl;
namespace
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/torrent_handle.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/torrent_handle.cpp 2008-02-26 00:15:48.624879426 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/torrent_handle.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/torrent_handle.cpp 2008-06-19 16:39:15.955003859 +0000
@@ -75,7 +75,6 @@
#endif
@@ -483,7 +483,7 @@
torrent* t = find_torrent(m_ses, m_chk, m_info_hash); \
if (t == 0) return def; \
t->call
-@@ -305,7 +304,7 @@
+@@ -311,7 +310,7 @@
TORRENT_ASSERT(m_chk);
session_impl::mutex_t::scoped_lock l(m_ses->m_mutex);
@@ -492,7 +492,7 @@
aux::piece_checker_data* d = m_chk->find_torrent(m_info_hash);
if (d != 0)
-@@ -466,7 +465,7 @@
+@@ -472,7 +471,7 @@
#endif
TORRENT_ASSERT(m_chk);
session_impl::mutex_t::scoped_lock l1(m_ses->m_mutex);
@@ -501,16 +501,16 @@
torrent* t = find_torrent(m_ses, m_chk, m_info_hash);
if (t == 0 || !t->valid_metadata())
#ifdef BOOST_NO_EXCEPTIONS
-@@ -483,7 +482,7 @@
+@@ -489,7 +488,7 @@
if (m_ses == 0) return false;
TORRENT_ASSERT(m_chk);
session_impl::mutex_t::scoped_lock l1(m_ses->m_mutex);
- mutex::scoped_lock l2(m_chk->m_mutex);
-+ boost::mutex::scoped_lock l2(m_chk->m_mutex);
++ boost::mutex::scoped_lock l2(m_chk->m_mutex);
torrent* t = find_torrent(m_ses, m_chk, m_info_hash);
- return t;
+ return t != 0;
}
-@@ -501,7 +500,7 @@
+@@ -507,7 +506,7 @@
TORRENT_ASSERT(m_chk);
session_impl::mutex_t::scoped_lock l(m_ses->m_mutex);
@@ -519,7 +519,7 @@
torrent* t = find_torrent(m_ses, m_chk, m_info_hash);
if (!t || !t->valid_metadata())
-@@ -659,7 +658,7 @@
+@@ -670,7 +669,7 @@
// the torrent is being checked. Add the peer to its
// peer list. The entries in there will be connected
// once the checking is complete.
@@ -528,8 +528,8 @@
aux::piece_checker_data* d = m_chk->find_torrent(m_info_hash);
if (d == 0)
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/udp_tracker_connection.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/udp_tracker_connection.cpp 2008-02-26 00:15:48.628030206 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/udp_tracker_connection.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/udp_tracker_connection.cpp 2008-06-19 16:36:06.009208730 +0000
@@ -187,7 +187,7 @@
char* ptr = send_buf;
@@ -557,9 +557,9 @@
if (!m_socket.is_open()) return; // the operation was aborted
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/upnp.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/upnp.cpp 2008-02-26 00:15:48.628649801 +0000
-@@ -614,14 +614,14 @@
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/upnp.cpp 2008-05-18 22:36:37.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/upnp.cpp 2008-06-19 16:36:06.009774227 +0000
+@@ -642,14 +642,14 @@
if (type == xml_start_tag)
{
if ((!state.top_tag.empty() && state.top_tag == "service")
@@ -576,7 +576,7 @@
{
state.top_tag.clear();
if (state.found_service) state.exit = true;
-@@ -633,7 +633,7 @@
+@@ -661,7 +661,7 @@
{
if (state.top_tag == "serviceType")
{
@@ -585,7 +585,7 @@
state.found_service = true;
}
else if (state.top_tag == "controlURL")
-@@ -755,7 +755,7 @@
+@@ -783,7 +783,7 @@
void find_error_code(int type, char const* string, error_code_parse_state& state)
{
if (state.exit) return;
@@ -594,9 +594,9 @@
{
state.in_error_code = true;
}
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/kademlia/node.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/kademlia/node.cpp 2008-02-26 00:15:48.629066668 +0000
-@@ -426,7 +426,7 @@
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/kademlia/node.cpp 2008-05-18 22:12:22.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/kademlia/node.cpp 2008-06-19 16:36:06.010181163 +0000
+@@ -428,7 +428,7 @@
int num = (std::min)((int)v.peers.size(), m_settings.max_peers_reply);
peers.clear();
peers.reserve(num);
@@ -605,8 +605,8 @@
, boost::make_transform_iterator(v.peers.end(), &get_endpoint)
, std::back_inserter(peers), num);
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/kademlia/rpc_manager.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/kademlia/rpc_manager.cpp 2008-02-26 00:15:48.629410788 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/kademlia/rpc_manager.cpp 2008-05-18 22:12:22.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/kademlia/rpc_manager.cpp 2008-06-19 16:36:06.010485270 +0000
@@ -82,7 +82,7 @@
if (--o->m_refs == 0)
{
@@ -625,8 +625,8 @@
, m_oldest_transaction_id(m_next_transaction_id)
, m_incoming(f)
, m_send(sf)
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/web_peer_connection.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/web_peer_connection.cpp 2008-02-26 00:15:48.629784810 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/web_peer_connection.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/web_peer_connection.cpp 2008-06-19 16:36:06.010826061 +0000
@@ -467,7 +467,7 @@
else
{
@@ -636,8 +636,8 @@
if (range_end == -1)
{
// we should not try this server again.
---- deluge-torrent-0.5.8.4-orig/libtorrent/include/libtorrent/asio/detail/resolver_service.hpp 2008-02-13 01:02:31.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/include/libtorrent/asio/detail/resolver_service.hpp 2008-02-26 00:15:48.630191309 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/include/libtorrent/asio/detail/resolver_service.hpp 2008-05-11 23:55:17.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/include/libtorrent/asio/detail/resolver_service.hpp 2008-06-19 16:36:06.011108335 +0000
@@ -329,7 +329,7 @@
void start_work_thread()
{
@@ -647,8 +647,8 @@
{
work_thread_.reset(new asio::detail::thread(
work_io_service_runner(*work_io_service_)));
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/lsd.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/lsd.cpp 2008-02-26 00:15:48.630413636 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/lsd.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/lsd.cpp 2008-06-19 16:36:06.011324195 +0000
@@ -166,7 +166,7 @@
sha1_hash ih(0);
std::istringstream ih_sstr(ih_str);
@@ -658,9 +658,9 @@
if (!ih.is_all_zeros() && port != 0)
{
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/http_tracker_connection.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/http_tracker_connection.cpp 2008-02-26 00:15:48.631687934 +0000
-@@ -704,7 +704,7 @@
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/http_tracker_connection.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/http_tracker_connection.cpp 2008-06-19 16:36:06.011841503 +0000
+@@ -705,7 +705,7 @@
if (m_parser.header_finished())
{
@@ -669,8 +669,8 @@
if (cl > m_settings.tracker_maximum_response_length)
{
fail(-1, "content-length is greater than maximum response length");
---- deluge-torrent-0.5.8.5.orig/libtorrent/src/enum_net.cpp 2008-02-28 01:39:28.000000000 -0500
-+++ deluge-torrent-0.5.8.5/libtorrent/src/enum_net.cpp 2008-03-02 22:25:30.035627513 -0500
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/enum_net.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/enum_net.cpp 2008-06-19 16:36:06.012071925 +0000
@@ -31,6 +31,7 @@
*/
@@ -679,8 +679,8 @@
#if defined TORRENT_BSD || defined TORRENT_LINUX
#include <sys/ioctl.h>
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/identify_client.cpp 2008-02-13 05:40:57.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/identify_client.cpp 2008-02-26 02:18:18.696540565 +0000
+--- deluge-torrent-0.5.9.1-orig/libtorrent/src/identify_client.cpp 2008-05-18 22:12:25.000000000 +0000
++++ deluge-torrent-0.5.9.1/libtorrent/src/identify_client.cpp 2008-06-19 16:36:06.012336233 +0000
@@ -34,6 +34,7 @@
#include <cctype>
Added: spec-files-extra/trunk/patches/gnupg2-03-jnlib-Makefile.diff
===================================================================
--- spec-files-extra/trunk/patches/gnupg2-03-jnlib-Makefile.diff (rev 0)
+++ spec-files-extra/trunk/patches/gnupg2-03-jnlib-Makefile.diff 2008-10-01 14:15:14 UTC (rev 1406)
@@ -0,0 +1,22 @@
+--- gnupg-2.0.8-orig/jnlib/Makefile.am 2008-03-08 07:42:01.000000000 +0000
++++ gnupg-2.0.8/jnlib/Makefile.am 2008-09-24 00:30:51.954846418 +0000
+@@ -63,7 +63,7 @@
+ module_tests = t-stringhelp
+
+ t_jnlib_src = t-support.c t-support.h
+-t_jnlib_ldadd = libjnlib.a $(LIBINTL) $(LIBICONV)
++t_jnlib_ldadd = libjnlib.a -lgpg-error $(LIBINTL) $(LIBICONV)
+
+ t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)
+ t_stringhelp_LDADD = $(t_jnlib_ldadd)
+--- gnupg-2.0.8-orig/jnlib/Makefile.in 2008-09-23 15:31:43.598606000 +0000
++++ gnupg-2.0.8/jnlib/Makefile.in 2008-09-24 00:31:27.076080342 +0000
+@@ -337,7 +337,7 @@
+ #
+ module_tests = t-stringhelp
+ t_jnlib_src = t-support.c t-support.h
+-t_jnlib_ldadd = libjnlib.a $(LIBINTL) $(LIBICONV)
++t_jnlib_ldadd = libjnlib.a -lgpg-error $(LIBINTL) $(LIBICONV)
+ t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)
+ t_stringhelp_LDADD = $(t_jnlib_ldadd)
+ all: all-am
Added: spec-files-extra/trunk/patches/gnupg2-04-keyserver-sm-Makefile.diff
===================================================================
--- spec-files-extra/trunk/patches/gnupg2-04-keyserver-sm-Makefile.diff (rev 0)
+++ spec-files-extra/trunk/patches/gnupg2-04-keyserver-sm-Makefile.diff 2008-10-01 14:15:14 UTC (rev 1406)
@@ -0,0 +1,62 @@
+Index: gnupg-2.0.8/keyserver/Makefile.in
+===================================================================
+--- gnupg-2.0.8-orig/keyserver/Makefile.in (revision 2578)
++++ gnupg-2.0.8/keyserver/Makefile.in (working copy)
+@@ -397,13 +397,13 @@
+ $(am__append_8)
+ @FAKE_CURL_FALSE@gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+ @FAKE_CURL_TRUE@gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
+-@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
++@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
+ @FAKE_CURL_TRUE@gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
+ @FAKE_CURL_TRUE@ $(other_libs)
+
+ @FAKE_CURL_FALSE@gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+ @FAKE_CURL_TRUE@gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
+-@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
++@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
+ @FAKE_CURL_TRUE@gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
+ @FAKE_CURL_TRUE@ $(other_libs)
+
+Index: gnupg-2.0.8/keyserver/Makefile.am
+===================================================================
+--- gnupg-2.0.8-orig/keyserver/Makefile.am (revision 2578)
++++ gnupg-2.0.8/keyserver/Makefile.am (working copy)
+@@ -61,9 +61,9 @@
+ $(other_libs)
+ else
+ gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+-gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
++gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
+ gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
+-gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
++gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(LIBCURL) $(GETOPT) $(NETLIBS) $(DNSLIBS) $(other_libs)
+ endif
+
+ # Make sure that all libs are build before we use them. This is
+Index: gnupg-2.0.8/sm/Makefile.in
+===================================================================
+--- gnupg-2.0.8-orig/sm/Makefile.in (revision 2578)
++++ gnupg-2.0.8/sm/Makefile.in (working copy)
+@@ -366,7 +366,7 @@
+ certreqgen-ui.c \
+ qualified.c
+
+-common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
++common_libs = $(libcommon) ../kbx/keybox-blob.o ../kbx/keybox-file.o ../kbx/keybox-init.o ../kbx/keybox-openpgp.o ../kbx/keybox-search.o ../kbx/keybox-update.o ../kbx/keybox-util.o ../jnlib/libjnlib.a \
+ ../gl/libgnu.a
+
+ gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
+Index: gnupg-2.0.8/sm/Makefile.am
+===================================================================
+--- gnupg-2.0.8-orig/sm/Makefile.am (revision 2578)
++++ gnupg-2.0.8/sm/Makefile.am (working copy)
+@@ -52,7 +52,7 @@
+ qualified.c
+
+
+-common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
++common_libs = $(libcommon) ../kbx/keybox-blob.o ../kbx/keybox-file.o ../kbx/keybox-init.o ../kbx/keybox-openpgp.o ../kbx/keybox-search.o ../kbx/keybox-update.o ../kbx/keybox-util.o ../jnlib/libjnlib.a \
+ ../gl/libgnu.a
+
+ gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-10-01 06:21:56
|
Revision: 1405
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1405&view=rev
Author: yippi
Date: 2008-10-01 06:20:29 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
2008-09-30 Brian Cameron <bri...@su...>
* SFEelisa-plugins-bad.spec, patches/elisa-plugins-bad-nohashlib.diff:
Add a patch to replace some hashlib.md5 functions with md5.md5 so
it generates less error messages when using Python 2.4.
* patches/elisa-02-defaultdict.diff: Fix patch so it works better.
* SFEpython-cssutils.spec: Avoid installing the easy-install.pth
file for now. Python-Twisted 8.1 also wants to install this file
and I'm not yet sure how to manange this.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEelisa-plugins-bad.spec
spec-files-extra/trunk/SFEpython-cssutils.spec
spec-files-extra/trunk/patches/elisa-02-defaultdict.diff
Added Paths:
-----------
spec-files-extra/trunk/patches/elisa-plugins-bad-01-nohashlib.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-30 23:15:33 UTC (rev 1404)
+++ spec-files-extra/trunk/ChangeLog 2008-10-01 06:20:29 UTC (rev 1405)
@@ -1,5 +1,15 @@
2008-09-30 Brian Cameron <bri...@su...>
+ * SFEelisa-plugins-bad.spec, patches/elisa-plugins-bad-nohashlib.diff:
+ Add a patch to replace some hashlib.md5 functions with md5.md5 so
+ it generates less error messages when using Python 2.4.
+ * patches/elisa-02-defaultdict.diff: Fix patch so it works better.
+ * SFEpython-cssutils.spec: Avoid installing the easy-install.pth
+ file for now. Python-Twisted 8.1 also wants to install this file
+ and I'm not yet sure how to manange this.
+
+2008-09-30 Brian Cameron <bri...@su...>
+
* SFEelisa.spec, patches/elisa-02-defaultdict.diff: Bump to 0.5.12
and add patch so it builds and works with Python 2.4.
* SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec: Bump to
Modified: spec-files-extra/trunk/SFEelisa-plugins-bad.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-30 23:15:33 UTC (rev 1404)
+++ spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-10-01 06:20:29 UTC (rev 1405)
@@ -15,6 +15,7 @@
URL: http://elisa.fluendo.com/
Version: %{version}
Source0: http://elisa.fluendo.com/static/download/elisa/elisa-plugins-bad-%{version}.tar.gz
+Patch1: elisa-plugins-bad-01-nohashlib.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: SFEelisa
@@ -30,6 +31,7 @@
%prep
%setup -q -n elisa-plugins-bad-%version
+%patch1 -p1
%build
Modified: spec-files-extra/trunk/SFEpython-cssutils.spec
===================================================================
--- spec-files-extra/trunk/SFEpython-cssutils.spec 2008-09-30 23:15:33 UTC (rev 1404)
+++ spec-files-extra/trunk/SFEpython-cssutils.spec 2008-10-01 06:20:29 UTC (rev 1405)
@@ -38,7 +38,7 @@
python setup.py install --prefix=$RPM_BUILD_ROOT/%_prefix
# Remove files we don't need.
-#rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/easy-install.pth
+rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/easy-install.pth
rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/site.py
rm -fR $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/site-packages/site.pyc
@@ -60,7 +60,7 @@
%{_bindir}/csscapture
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/python%{pythonver}/vendor-packages/cssutils*.egg
-%{_libdir}/python%{pythonver}/vendor-packages/easy-install.pth
+#%{_libdir}/python%{pythonver}/vendor-packages/easy-install.pth
%changelog
* Thu Sep 18 2008 - jij...@su...
Modified: spec-files-extra/trunk/patches/elisa-02-defaultdict.diff
===================================================================
--- spec-files-extra/trunk/patches/elisa-02-defaultdict.diff 2008-09-30 23:15:33 UTC (rev 1404)
+++ spec-files-extra/trunk/patches/elisa-02-defaultdict.diff 2008-10-01 06:20:29 UTC (rev 1405)
@@ -14,7 +14,7 @@
name=section_name)
- real_section.comments = defaultdict(str, \
-+ real_section.comments = dict(str, \
++ real_section.comments = dict( \
[(k, ['# %s' % line for line in textwrap.wrap(v, 77)]) \
for k,v in doc.iteritems()])
self._config[section_name] = real_section
Added: spec-files-extra/trunk/patches/elisa-plugins-bad-01-nohashlib.diff
===================================================================
--- spec-files-extra/trunk/patches/elisa-plugins-bad-01-nohashlib.diff (rev 0)
+++ spec-files-extra/trunk/patches/elisa-plugins-bad-01-nohashlib.diff 2008-10-01 06:20:29 UTC (rev 1405)
@@ -0,0 +1,39 @@
+--- elisa-plugins-bad-0.5.12/elisa/plugins/poblesec/music_library.py-orig 2008-09-30 23:24:14.828078000 -0500
++++ elisa-plugins-bad-0.5.12/elisa/plugins/poblesec/music_library.py 2008-09-30 23:25:26.955173000 -0500
+@@ -42,14 +42,14 @@ except ImportError:
+
+ from elisa.core.utils import defer
+
+-import os, hashlib
++import os, md5
+
+
+ # TODO: factorize this code in the core of Elisa in a caching utilities module
+ def _thumbnail_file(thumbnail_uri):
+ if not os.path.exists(PICTURES_CACHE):
+ os.makedirs(PICTURES_CACHE, 0755)
+- thumbnail = hashlib.md5(str(thumbnail_uri)).hexdigest() + '.jpg'
++ thumbnail = md5.md5(str(thumbnail_uri)).hexdigest() + '.jpg'
+ return os.path.join(PICTURES_CACHE, thumbnail)
+
+
+--- elisa-plugins-bad-0.5.12/elisa/plugins/database/dbus_service.py-orig 2008-09-30 23:24:46.842282000 -0500
++++ elisa-plugins-bad-0.5.12/elisa/plugins/database/dbus_service.py 2008-09-30 23:25:05.351048000 -0500
+@@ -36,7 +36,7 @@ from elisa.plugins.database.models impor
+
+ from storm.expr import Desc, Asc
+
+-import hashlib, os
++import md5, os
+
+
+ def result_set_order_offset_and_limit(result_set, field, offset, limit):
+@@ -86,7 +86,7 @@ def build_last_track_played_tuple(music_
+
+
+ def _thumbnail_file(uri):
+- thumbnail = hashlib.md5(str(uri)).hexdigest() + '.jpg'
++ thumbnail = md5.md5(str(uri)).hexdigest() + '.jpg'
+ filename = os.path.join(PICTURES_CACHE, thumbnail)
+ return filename
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-09-30 23:16:49
|
Revision: 1404
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1404&view=rev
Author: yippi
Date: 2008-09-30 23:15:33 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
2008-09-30 Brian Cameron <bri...@su...>
* SFEelisa.spec, patches/elisa-02-defaultdict.diff: Bump to 0.5.12
and add patch so it builds and works with Python 2.4.
* SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec: Bump to
0.5.12.
* SFEpigment.spec: Bump to 0.3.10.
* SFEpigment-python.spec: Bump to 0.3.8.
* SFEpython-twisted-web2.spec: Bump to 8.1.0.
* SFEjokosher.spec: Bump to 0.10.1.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEelisa-plugins-bad.spec
spec-files-extra/trunk/SFEelisa-plugins-good.spec
spec-files-extra/trunk/SFEelisa.spec
spec-files-extra/trunk/SFEjokosher.spec
spec-files-extra/trunk/SFEpigment-python.spec
spec-files-extra/trunk/SFEpigment.spec
spec-files-extra/trunk/SFEpython-twisted-web2.spec
spec-files-extra/trunk/SFEsimplejson.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/elisa-02-defaultdict.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/ChangeLog 2008-09-30 23:15:33 UTC (rev 1404)
@@ -1,3 +1,14 @@
+2008-09-30 Brian Cameron <bri...@su...>
+
+ * SFEelisa.spec, patches/elisa-02-defaultdict.diff: Bump to 0.5.12
+ and add patch so it builds and works with Python 2.4.
+ * SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec: Bump to
+ 0.5.12.
+ * SFEpigment.spec: Bump to 0.3.10.
+ * SFEpigment-python.spec: Bump to 0.3.8.
+ * SFEpython-twisted-web2.spec: Bump to 8.1.0.
+ * SFEjokosher.spec: Bump to 0.10.1.
+
2008-09-28 Alfred Peng <alf...@su...>
* SFEgftp.spec: Update group bit for %{_datadir}/man.
Modified: spec-files-extra/trunk/SFEelisa-plugins-bad.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-bad
-%define version 0.5.11
+%define version 0.5.12
%include Solaris.inc
@@ -79,6 +79,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Tue Sep 30 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.12.
* Thu Sep 25 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa-plugins-good.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-good
-%define version 0.5.11
+%define version 0.5.12
%include Solaris.inc
@@ -74,6 +74,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Tue Sep 30 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.12.
* Thu Sep 25 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEelisa.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -11,7 +11,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa
-%define version 0.5.11
+%define version 0.5.12
%include Solaris.inc
@@ -22,6 +22,8 @@
Source0: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz
# See bug #249822.
Patch1: elisa-01-fixlocale.diff
+# See bug #268485.
+Patch2: elisa-02-defaultdict.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SUNWPython-devel
@@ -66,6 +68,7 @@
%prep
%setup -q -n elisa-%version
%patch1 -p1
+%patch2 -p1
%build
@@ -116,6 +119,9 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_generic_setup.pyc
%changelog
+* Tue Sep 30 2008 Brian Cameron <bri...@su...
+- Bump to 0.5.12. Add patch elisa-02-defaultdict.diff, so it no longer
+ depends on Python 2.5 and works with 2.4.
* Thu Sep 25 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEjokosher.spec
===================================================================
--- spec-files-extra/trunk/SFEjokosher.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEjokosher.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -9,10 +9,9 @@
Name: SFEjokosher
Summary: Jokosher is a multi-track studio application
-Version: 0.10
+Version: 0.10.1
URL: http://jokosher.org
-Source0: http://launchpad.net/jokosher/%{version}/%{version}/+download/jokosher-%{version}.tar.gz
-Patch1: jokosher-01-fixdesktop.diff
+Source0: http://launchpad.net/jokosher/0.10/%{version}/+download/jokosher-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/jokosher-%{version}-build
Requires: SUNWgnome-python-libs
@@ -39,7 +38,6 @@
%prep
%setup -q -n jokosher-%version
-#%patch1 -p1
%build
python setup.py build
@@ -128,6 +126,8 @@
%endif
%changelog
+* Tue Sep 30 2008 - bri...@su...
+- Bump to 0.10.1
* Fri Aug 29 2008 - bri...@su...
- Bump to 0.10. Yay! Remove patch jokosher-01-fixdesktop.diff as it is no
longer needed.
Modified: spec-files-extra/trunk/SFEpigment-python.spec
===================================================================
--- spec-files-extra/trunk/SFEpigment-python.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEpigment-python.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -4,7 +4,7 @@
# includes module(s): pigment-python
#
%define name pigment-python
-%define version 0.3.7
+%define version 0.3.8
%define pythonver 2.4
%include Solaris.inc
@@ -85,6 +85,8 @@
%{_datadir}/pigment-python
%changelog
+* Tue Sep 30 2008 Brian Cameron <bri...@su...>
+- Bump to 0.3.8.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
- Bump to 0.3.7.
* Thu Sep 11 2008 Jerry Yu <jij...@su...>
Modified: spec-files-extra/trunk/SFEpigment.spec
===================================================================
--- spec-files-extra/trunk/SFEpigment.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEpigment.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -4,7 +4,7 @@
# includes module(s): pigment
#
%define name pigment
-%define version 0.3.9
+%define version 0.3.10
%include Solaris.inc
@@ -94,6 +94,8 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Sep 30 2008 Brian Cameron <bri...@su...>
+- Bump to 0.3.10.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
- Bump to 0.3.9. Remove upstream patch pigment-01-m4.diff.
* Thu Sep 10 2008 Jerry Yu <jij...@su...>
Modified: spec-files-extra/trunk/SFEpython-twisted-web2.spec
===================================================================
--- spec-files-extra/trunk/SFEpython-twisted-web2.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEpython-twisted-web2.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -13,8 +13,8 @@
Name: SFEpython-twisted-web2
Summary: A HTTP/1.1 Server Framework
URL: http://twistedmatrix.com/trac/
-Version: 0.2.0
-Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
+Version: 8.1.0
+Source: http://tmrc.mit.edu/mirror/twisted/Web2/8.1/TwistedWeb2-%{version}.tar.bz2
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: SUNWPython
@@ -51,5 +51,7 @@
%{_libdir}/python%{pythonver}/vendor-packages/twisted
%changelog
+* Tue Sep 30 2008 - bri...@su...
+- Bump to 8.1.0.
* Fri Jul 25 2008 - bri...@su...
- Initial version.
Modified: spec-files-extra/trunk/SFEsimplejson.spec
===================================================================
--- spec-files-extra/trunk/SFEsimplejson.spec 2008-09-29 16:11:41 UTC (rev 1403)
+++ spec-files-extra/trunk/SFEsimplejson.spec 2008-09-30 23:15:33 UTC (rev 1404)
@@ -11,7 +11,7 @@
Name: SFEsimplejson
Summary: Simple, fast, extensible JSON encoder and decoder for Python
URL: http://undefined.org/python/#simplejson
-Version: 1.9.1
+Version: 2.0.1
Source: %{src_url}/%{src_name}-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,5 +51,7 @@
%{_libdir}/python%{python_version}/vendor-packages
%changelog
+* Tue Sep 30 2008 - bri...@su...
+- Bump to 2.0.1.
* Sun May 25 2008 - Ananth Shrinivas <an...@su...>
- Initial Version
Added: spec-files-extra/trunk/patches/elisa-02-defaultdict.diff
===================================================================
--- spec-files-extra/trunk/patches/elisa-02-defaultdict.diff (rev 0)
+++ spec-files-extra/trunk/patches/elisa-02-defaultdict.diff 2008-09-30 23:15:33 UTC (rev 1404)
@@ -0,0 +1,20 @@
+--- elisa-0.5.12/elisa/core/config.py-orig 2008-09-30 17:34:31.498716000 -0500
++++ elisa-0.5.12/elisa/core/config.py 2008-09-30 17:34:42.463815000 -0500
+@@ -32,8 +32,6 @@ import os
+ import textwrap
+ import tempfile
+
+-from collections import defaultdict
+-
+ class ConfigError(Exception):
+
+ def __init__(self, msg):
+@@ -268,7 +266,7 @@ class Config(log.Loggable):
+ indict=section,
+ name=section_name)
+
+- real_section.comments = defaultdict(str, \
++ real_section.comments = dict(str, \
+ [(k, ['# %s' % line for line in textwrap.wrap(v, 77)]) \
+ for k,v in doc.iteritems()])
+ self._config[section_name] = real_section
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-09-29 16:13:53
|
Revision: 1403
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1403&view=rev
Author: yippi
Date: 2008-09-29 16:11:41 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
Add bug comment.
Modified Paths:
--------------
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-28 10:56:19 UTC (rev 1402)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-29 16:11:41 UTC (rev 1403)
@@ -32,7 +32,7 @@
Patch4: gdm-04-dynamic-display.diff
# Possible fix for unwritable gdm user $HOME. gnome-session
# tries to update ~/.ICEAuthority and gdm-simple-greeter crashes
-# when looking up option widgets.
+# when looking up option widgets. Refer to bugzilla bug #554242.
Patch5: gdm-05-ICE-optionwidget.diff
# Fix gconf-santiy-check-2 warning dialog.
# Please see http://bugzilla.gnome.org/show_bug.cgi?id=550832
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alf...@us...> - 2008-09-28 10:56:30
|
Revision: 1402
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1402&view=rev
Author: alfredpeng
Date: 2008-09-28 10:56:19 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
2008-09-28 Alfred Peng <alf...@su...>
* SFEgftp.spec: Update group bit for %{_datadir}/man.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEgftp.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-27 05:19:01 UTC (rev 1401)
+++ spec-files-extra/trunk/ChangeLog 2008-09-28 10:56:19 UTC (rev 1402)
@@ -1,3 +1,7 @@
+2008-09-28 Alfred Peng <alf...@su...>
+
+ * SFEgftp.spec: Update group bit for %{_datadir}/man.
+
2008-09-25 Brian Cameron <bri...@su...>
* SUNWgnome-display-mgr.spec, patches/gdm-05-ICE-optionwidget.diff,
Modified: spec-files-extra/trunk/SFEgftp.spec
===================================================================
--- spec-files-extra/trunk/SFEgftp.spec 2008-09-27 05:19:01 UTC (rev 1401)
+++ spec-files-extra/trunk/SFEgftp.spec 2008-09-28 10:56:19 UTC (rev 1402)
@@ -60,7 +60,7 @@
%{_datadir}/applications/*
%dir %attr (0755, root, other) %{_datadir}/gftp
%{_datadir}/gftp/*
-%dir %attr (0755, root, other) %{_datadir}/man
+%dir %attr (0755, root, bin) %{_datadir}/man
%{_datadir}/man/*
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
@@ -73,6 +73,8 @@
%endif
%changelog
+* Sun Sep 28 2008 - alf...@su...
+- Update group bit for %{_datadir}/man.
* Wed Sep 24 2008 - alf...@su...
- Backport the patch gftp-01-solaris-in-trunk.diff from trunk to build
with Sun Studio.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-09-27 05:20:12
|
Revision: 1401
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1401&view=rev
Author: yippi
Date: 2008-09-27 05:19:01 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
2008-09-25 Brian Cameron <bri...@su...>
* SUNWgnome-display-mgr.spec, patches/gdm-05-ICE-optionwidget.diff,
patches/gdm-06-gconfsanity.diff: Renumber patches.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/gdm-05-ICE-optionwidget.diff
spec-files-extra/trunk/patches/gdm-06-gconfsanity.diff
Removed Paths:
-------------
spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-26 19:10:03 UTC (rev 1400)
+++ spec-files-extra/trunk/ChangeLog 2008-09-27 05:19:01 UTC (rev 1401)
@@ -1,3 +1,8 @@
+2008-09-25 Brian Cameron <bri...@su...>
+
+ * SUNWgnome-display-mgr.spec, patches/gdm-05-ICE-optionwidget.diff,
+ patches/gdm-06-gconfsanity.diff: Renumber patches.
+
2008-09-27 Alfred Peng <alf...@su...>
* SFEamule.spec, patches/amule-01-sun-studio12.patch:
@@ -245,7 +250,7 @@
2008-08-29 Alfred Peng <alf...@su...>
* SFEfilezilla.spec base-specs/filezilla.spec: Bump to 3.1.1.
- Remove upstreamed patches.
+ Remove upstreamed patches.
* patches/filezilla-01-iter++.diff:
* patches/filezilla-02-SetActive.diff:
* patches/filezilla-03-msgfmt.diff:
@@ -514,9 +519,9 @@
2008-08-15 Glynn Foster <gly...@su...>
* SFEalsa-lib.spec, SFEalsa-plugins.spec, SFEalsa-utils.spec,
- copyright/SFEalsa-lib.copyright,
- copyright/SFEalsa-plugins.copyright,
- copyright/SFEalsa-utils.copyright: Add copyright and grouping.
+ copyright/SFEalsa-lib.copyright,
+ copyright/SFEalsa-plugins.copyright,
+ copyright/SFEalsa-utils.copyright: Add copyright and grouping.
2008-08-15 Glynn Foster <gly...@su...>
@@ -527,15 +532,15 @@
2008-08-15 Glynn Foster <gly...@su...>
* SFEadns.spec, SFEafio.spec, SFEafterstep.spec,
- copyright/SFEadns.copyright,
- copyright/SFEafio.copyright,
- copyright/SFEafterstep.copyright: Add copyright and grouping.
+ copyright/SFEadns.copyright,
+ copyright/SFEafio.copyright,
+ copyright/SFEafterstep.copyright: Add copyright and grouping.
2008-08-15 Glynn Foster <gly...@su...>
* SFEaalib.spec, SFEabiword.spec,
- copyright/SFEaalib.copyright, copyright/SFEabiword.copyright:
- Add copyright and grouping.
+ copyright/SFEaalib.copyright, copyright/SFEabiword.copyright:
+ Add copyright and grouping.
2008-08-15 Glynn Foster <gly...@su...>
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-26 19:10:03 UTC (rev 1400)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-27 05:19:01 UTC (rev 1401)
@@ -33,10 +33,10 @@
# Possible fix for unwritable gdm user $HOME. gnome-session
# tries to update ~/.ICEAuthority and gdm-simple-greeter crashes
# when looking up option widgets.
-Patch6: gdm-06-ICE-optionwidget.diff
+Patch5: gdm-05-ICE-optionwidget.diff
# Fix gconf-santiy-check-2 warning dialog.
# Please see http://bugzilla.gnome.org/show_bug.cgi?id=550832
-Patch7: gdm-07-gconfsanity.diff
+Patch6: gdm-06-gconfsanity.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -310,6 +310,8 @@
%endif
%changelog
+* Sat Sep 27 2008 - bri...@su...
+- Renumber patches.
* Wed Sep 24 2008 - sim...@su...
- Bump to 2.24.0. Remove upstream 05-crash.diff.
* Wed Sep 17 2008 - bri...@su...
Copied: spec-files-extra/trunk/patches/gdm-05-ICE-optionwidget.diff (from rev 1400, spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff)
===================================================================
--- spec-files-extra/trunk/patches/gdm-05-ICE-optionwidget.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-05-ICE-optionwidget.diff 2008-09-27 05:19:01 UTC (rev 1401)
@@ -0,0 +1,27 @@
+--- daemon/gdm-welcome-session.c.orig 2008-09-06 18:40:04.753453000 +0800
++++ daemon/gdm-welcome-session.c 2008-09-06 18:42:20.633895000 +0800
+@@ -278,6 +278,8 @@
+
+ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (welcome_session->priv->x11_authority_file));
+ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (welcome_session->priv->x11_display_name));
++ /* Due to HOME dirctory of gdm user, use tmp dir instead */
++ g_hash_table_insert (hash, g_strdup ("ICEAUTHORITY"), g_strdup ("/tmp/.ICEauthority"));
+
+ #if 0
+ /* hackish ain't it */
+--- gui/simple-greeter/gdm-option-widget.c.orig 2008-09-08 16:25:23.929558000 +0800
++++ gui/simple-greeter/gdm-option-widget.c 2008-09-08 16:30:11.180315000 +0800
+@@ -281,9 +281,10 @@
+ const char *item)
+ {
+ g_return_if_fail (GDM_IS_OPTION_WIDGET (widget));
+- g_return_if_fail (item == NULL ||
+- gdm_option_widget_lookup_item (widget, item,
+- NULL, NULL, NULL));
++ if ((item != NULL &&
++ ! gdm_option_widget_lookup_item (widget, item,
++ NULL, NULL, NULL)))
++ return;
+
+ if (widget->priv->default_item_id == NULL ||
+ item == NULL ||
Deleted: spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff 2008-09-26 19:10:03 UTC (rev 1400)
+++ spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff 2008-09-27 05:19:01 UTC (rev 1401)
@@ -1,27 +0,0 @@
---- daemon/gdm-welcome-session.c.orig 2008-09-06 18:40:04.753453000 +0800
-+++ daemon/gdm-welcome-session.c 2008-09-06 18:42:20.633895000 +0800
-@@ -278,6 +278,8 @@
-
- g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (welcome_session->priv->x11_authority_file));
- g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (welcome_session->priv->x11_display_name));
-+ /* Due to HOME dirctory of gdm user, use tmp dir instead */
-+ g_hash_table_insert (hash, g_strdup ("ICEAUTHORITY"), g_strdup ("/tmp/.ICEauthority"));
-
- #if 0
- /* hackish ain't it */
---- gui/simple-greeter/gdm-option-widget.c.orig 2008-09-08 16:25:23.929558000 +0800
-+++ gui/simple-greeter/gdm-option-widget.c 2008-09-08 16:30:11.180315000 +0800
-@@ -281,9 +281,10 @@
- const char *item)
- {
- g_return_if_fail (GDM_IS_OPTION_WIDGET (widget));
-- g_return_if_fail (item == NULL ||
-- gdm_option_widget_lookup_item (widget, item,
-- NULL, NULL, NULL));
-+ if ((item != NULL &&
-+ ! gdm_option_widget_lookup_item (widget, item,
-+ NULL, NULL, NULL)))
-+ return;
-
- if (widget->priv->default_item_id == NULL ||
- item == NULL ||
Copied: spec-files-extra/trunk/patches/gdm-06-gconfsanity.diff (from rev 1400, spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff)
===================================================================
--- spec-files-extra/trunk/patches/gdm-06-gconfsanity.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-06-gconfsanity.diff 2008-09-27 05:19:01 UTC (rev 1401)
@@ -0,0 +1,9 @@
+--- data/gconf.path.orig 2008-09-08 14:11:27.378093000 +0800
++++ data/gconf.path 2008-09-08 14:11:35.518684000 +0800
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++# xml:readonly:/etc/gconf/gconf.xml.system
+
+ # override some settings
+ # we treat settings in this location as
Deleted: spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-26 19:10:03 UTC (rev 1400)
+++ spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-27 05:19:01 UTC (rev 1401)
@@ -1,9 +0,0 @@
---- data/gconf.path.orig 2008-09-08 14:11:27.378093000 +0800
-+++ data/gconf.path 2008-09-08 14:11:35.518684000 +0800
-@@ -1,5 +1,5 @@
- # treat system-wide settings as mandatory
--xml:readonly:/etc/gconf/gconf.xml.system
-+# xml:readonly:/etc/gconf/gconf.xml.system
-
- # override some settings
- # we treat settings in this location as
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alf...@us...> - 2008-09-26 19:10:13
|
Revision: 1400
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1400&view=rev
Author: alfredpeng
Date: 2008-09-26 19:10:03 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
2008-09-27 Alfred Peng <alf...@su...>
* SFEamule.spec, patches/amule-01-sun-studio12.patch:
* copyright/SFEamule.copyright:
add new spec, patch to build with Sun Studio and copyright.
* SFElibcryptopp.spec: Bump to 5.5.2.
* SFEfilezilla.spec:
* copyright/SFEfilezilla.copyright:
add copyright.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEfilezilla.spec
spec-files-extra/trunk/SFElibcryptopp.spec
Added Paths:
-----------
spec-files-extra/trunk/SFEamule.spec
spec-files-extra/trunk/copyright/SFEamule.copyright
spec-files-extra/trunk/copyright/SFEfilezilla.copyright
spec-files-extra/trunk/patches/amule-01-sun-studio12.patch
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-26 17:59:40 UTC (rev 1399)
+++ spec-files-extra/trunk/ChangeLog 2008-09-26 19:10:03 UTC (rev 1400)
@@ -1,3 +1,13 @@
+2008-09-27 Alfred Peng <alf...@su...>
+
+ * SFEamule.spec, patches/amule-01-sun-studio12.patch:
+ * copyright/SFEamule.copyright:
+ add new spec, patch to build with Sun Studio and copyright.
+ * SFElibcryptopp.spec: Bump to 5.5.2.
+ * SFEfilezilla.spec:
+ * copyright/SFEfilezilla.copyright:
+ add copyright.
+
2008-09-25 Brian Cameron <bri...@su...>
* SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
Added: spec-files-extra/trunk/SFEamule.spec
===================================================================
--- spec-files-extra/trunk/SFEamule.spec (rev 0)
+++ spec-files-extra/trunk/SFEamule.spec 2008-09-26 19:10:03 UTC (rev 1400)
@@ -0,0 +1,98 @@
+#
+# spec file for package SFEamule
+#
+# includes module(s): amule
+#
+%include Solaris.inc
+
+Name: SFEamule
+Summary: aMule, an eMule-like client for the eD2k and Kademlia networks.
+Version: 2.2.2
+Source: http://prdownload.berlios.de/amule/aMule-%{version}.tar.bz2
+URL: http://www.amule.org/
+SUNW_Copyright: %{name}.copyright
+
+# owner:alfred date:2008-07-16 type:bug
+Patch1: amule-01-sun-studio12.patch
+
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SFEwxwidgets
+Requires: SFEcryptopp-i386
+BuildRequires: SFEwxwidgets-devel
+
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%prep
+%setup -q -n aMule-%version
+%patch1 -p1
+
+%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 PATH="/usr/bin:$PATH"
+export LDFLAGS="-norunpath"
+
+autoconf
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man/de
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man/es
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man/eu
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man/fr
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man/hu
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%doc(bzip2) -d docs COPYING license.txt Changelog AUTHORS README
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, bin) %{_libdir}/xchat
+%{_libdir}/xchat/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%{_datadir}/amule
+%dir %attr (0755, root, other) %{_datadir}/doc
+%dir %attr (0755, root, other) %{_datadir}/doc/amule
+%{_datadir}/doc/amule/*
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/*
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Sat Sep 27 2008 - alf...@su...
+- Initial version
Modified: spec-files-extra/trunk/SFEfilezilla.spec
===================================================================
--- spec-files-extra/trunk/SFEfilezilla.spec 2008-09-26 17:59:40 UTC (rev 1399)
+++ spec-files-extra/trunk/SFEfilezilla.spec 2008-09-26 19:10:03 UTC (rev 1400)
@@ -16,6 +16,7 @@
Name: SFEfilezilla
Summary: FileZilla FTP client
Version: %{filezilla.version}
+SUNW_Copyright: %{name}.copyright
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,6 +75,8 @@
%files
%defattr (-, root, bin)
+%doc(bzip2) -d filezilla-%{filezilla.version} COPYING GPL.html NEWS AUTHORS README
+%doc -d filezilla-%{filezilla.version} ChangeLog
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, sys) %{_datadir}
@@ -98,6 +101,8 @@
%changelog
+* Sat Sep 27 2008 - alf...@su...
+- Add %doc to %files for copyright.
* Fri Aug 29 2008 - alf...@su...
- Update %files to include icons.
* Thu Mar 06 2008 - no...@us...
Modified: spec-files-extra/trunk/SFElibcryptopp.spec
===================================================================
--- spec-files-extra/trunk/SFElibcryptopp.spec 2008-09-26 17:59:40 UTC (rev 1399)
+++ spec-files-extra/trunk/SFElibcryptopp.spec 2008-09-26 19:10:03 UTC (rev 1400)
@@ -6,7 +6,7 @@
%include Solaris.inc
%define src_name cryptopp
-%define src_version 551
+%define src_version 552
%define pkg_release 1
# ===========================================================================
@@ -21,7 +21,7 @@
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Name: SFElibcryptopp
Summary: libcrypto++ - C++ class library of cryptographic algorithms
-Version: 551
+Version: 552
Source: %{src_url}/%{src_name}%{version}.zip
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +58,8 @@
%{_libdir}/*
%changelog
+* Sat Sep 27 2008 - alf...@su...
+- Bump to 5.5.2.
* Sat Aug 11 2007 - an...@su...
- Initial version
Added: spec-files-extra/trunk/copyright/SFEamule.copyright
===================================================================
--- spec-files-extra/trunk/copyright/SFEamule.copyright (rev 0)
+++ spec-files-extra/trunk/copyright/SFEamule.copyright 2008-09-26 19:10:03 UTC (rev 1400)
@@ -0,0 +1,14 @@
+Licensing and copyright information for %{name}:
+
+ License: GNU General Public License Version 2
+
+ You can find more information in the following directory:
+ %{_pkg_docdir}
+
+ COPYING.bz2, license.txt.bz2: GNU GPL
+ Changelog.bz2: link to all the changes
+ AUTHORS.bz2: list of authors of aMule
+ README.bz2: more information about aMule
+
+ The sources of aMule-%{version} were downloaded
+ from %{SOURCE0.url}
Added: spec-files-extra/trunk/copyright/SFEfilezilla.copyright
===================================================================
--- spec-files-extra/trunk/copyright/SFEfilezilla.copyright (rev 0)
+++ spec-files-extra/trunk/copyright/SFEfilezilla.copyright 2008-09-26 19:10:03 UTC (rev 1400)
@@ -0,0 +1,15 @@
+Licensing and copyright information for %{name}:
+
+ License: GNU General Public License Version 2
+
+ You can find more information in the following directory:
+ %{_pkg_docdir}
+
+ COPYING.bz2, GPL.html.bz2: GNU GPL
+ NEWS.bz2: list of the most important changes in Bluefish
+ ChangeLog: link to all the changes
+ AUTHORS.bz2: list of authors of FileZilla
+ README.bz2: more information about FileZilla
+
+ The sources of filezilla-%{filezilla.version} were downloaded
+ from %{filezilla.SOURCE0.url}
Added: spec-files-extra/trunk/patches/amule-01-sun-studio12.patch
===================================================================
--- spec-files-extra/trunk/patches/amule-01-sun-studio12.patch (rev 0)
+++ spec-files-extra/trunk/patches/amule-01-sun-studio12.patch 2008-09-26 19:10:03 UTC (rev 1400)
@@ -0,0 +1,441 @@
+--- aMule-2.2.2/autogen.sh.orig Fri Sep 26 18:20:47 2008
++++ aMule-2.2.2/autogen.sh Fri Sep 26 18:16:52 2008
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Helps bootstrapping 'aMule' when checked out from CVS.
+ # Requires GNU autoconf, GNU automake and GNU which.
+
+--- aMule-2.2.2/src/ArchSpecific.h.orig Fri Sep 26 18:21:22 2008
++++ aMule-2.2.2/src/ArchSpecific.h Fri Sep 26 18:21:40 2008
+@@ -33,7 +33,7 @@
+ #define ENDIAN_SWAP_32(x) (wxUINT32_SWAP_ON_BE(x))
+ #define ENDIAN_SWAP_I_32(x) x = wxUINT32_SWAP_ON_BE(x)
+
+-#if ((defined __GNUC__) && __GNUC__ >= 2) || defined (_MSC_VER)
++#if ((defined __GNUC__) && __GNUC__ >= 2) || defined (_MSC_VER) || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550))
+ #define ENDIAN_SWAP_64(x) (wxUINT64_SWAP_ON_BE(x))
+ #define ENDIAN_SWAP_I_64(x) x = wxUINT64_SWAP_ON_BE(x)
+ #endif
+--- aMule-2.2.2/src/StatTree.h.orig Fri Sep 26 18:29:18 2008
++++ aMule-2.2.2/src/StatTree.h Fri Sep 26 18:51:14 2008
+@@ -240,7 +240,7 @@
+ /**
+ * Resorts children for the stSortByValue flag.
+ */
+- void ReSortChildren() { wxMutexLocker lock(m_lock); m_children.sort(ValueSort); }
++ void ReSortChildren() { wxMutexLocker lock(m_lock); m_children.sort(); }
+ #endif
+
+ #ifndef AMULE_DAEMON
+--- aMule-2.2.2/src/amule.cpp.orig Fri Sep 26 19:06:01 2008
++++ aMule-2.2.2/src/amule.cpp Fri Sep 26 19:09:08 2008
+@@ -386,7 +386,7 @@
+ }
+
+ theApp->ShowAlert(msg, wxT("Fatal error."), wxICON_ERROR | wxOK);
+- return std::pair<bool, wxString>(false, wxEmptyString);
++ return std::pair<bool, CPath>(false, CPath(wxEmptyString));
+ }
+
+
+@@ -845,10 +845,7 @@
+ } else {
+ delete p;
+ ShowAlert(_(
+- "You requested to run web server on startup, "
+- "but the amuleweb binary cannot be run. "
+- "Please install the package containing aMule web server, "
+- "or compile aMule using --enable-webserver and run make install"),
++ "You requested to run web server on startup, but the amuleweb binary cannot be run. Please install the package containing aMule web server, or compile aMule using --enable-webserver and run make install"),
+ _("ERROR"), wxOK | wxICON_ERROR);
+ }
+ }
+--- aMule-2.2.2/src/ClientList.h.orig Fri Sep 26 19:12:25 2008
++++ aMule-2.2.2/src/ClientList.h Fri Sep 26 19:13:52 2008
+@@ -282,7 +282,7 @@
+ //! The type of the lists used to store IPs and IDs.
+ typedef std::multimap<uint32, CUpDownClient*> IDMap;
+ //! The pairs of the IP/ID list.
+- typedef std::pair<uint32, CUpDownClient*> IDMapPair;
++ typedef std::pair<const uint32, CUpDownClient*> IDMapPair;
+
+
+ /**
+@@ -393,7 +393,7 @@
+ //! The type of the list used to store user-hashes.
+ typedef std::multimap<CMD4Hash, CUpDownClient*> HashMap;
+ //! The pairs of the Hash-list.
+- typedef std::pair<CMD4Hash, CUpDownClient*> HashMapPair;
++ typedef std::pair<const CMD4Hash, CUpDownClient*> HashMapPair;
+
+
+ //! The map of clients with valid hashes
+--- aMule-2.2.2/src/ClientList.cpp.orig Fri Sep 26 19:11:17 2008
++++ aMule-2.2.2/src/ClientList.cpp Fri Sep 26 19:14:53 2008
+@@ -271,7 +271,7 @@
+
+ CUpDownClient* CClientList::FindMatchingClient( CUpDownClient* client )
+ {
+- typedef std::pair<IDMap::const_iterator, IDMap::const_iterator> IDMapIteratorPair;
++ typedef std::pair<IDMap::iterator, IDMap::iterator> IDMapIteratorPair;
+ wxCHECK(client, NULL);
+
+ const uint32 userIP = client->GetIP();
+@@ -317,7 +317,7 @@
+ }
+ } else if (userPort || userKadPort) {
+ // Check by IP first, then by ID
+- struct { const IDMap& map; uint32 value; } toCheck[] = {
++ struct { IDMap map; uint32 value; } toCheck[] = {
+ { m_ipList, userIP }, { m_clientList, userID }
+ };
+
+--- aMule-2.2.2/src/RangeMap.h.orig Fri Sep 26 23:20:22 2008
++++ aMule-2.2.2/src/RangeMap.h Fri Sep 26 23:31:04 2008
+@@ -119,7 +119,7 @@
+ //! The map uses the start-key as key and the User-value and end-key pair as value
+ typedef std::map<KEYTYPE, HELPER> RangeMap;
+ //! Shortcut for the pair used by the RangeMap.
+- typedef std::pair<KEYTYPE, HELPER> RangePair;
++ typedef std::pair<const KEYTYPE, HELPER> RangePair;
+
+ //! Typedefs used to distinguish between our custom iterator and the real ones.
+ typedef typename RangeMap::iterator RangeIterator;
+@@ -420,7 +420,10 @@
+ }
+ template <typename TYPE>
+ iterator insert(KEYTYPE startPos, KEYTYPE endPos, const TYPE& value) {
+- HELPER entry = {endPos, value};
++// HELPER entry = {endPos, value};
++ HELPER entry = {};
++ entry.first = endPos;
++ entry.second = value;
+ return do_insert(startPos, entry);
+ }
+ //@}
+--- aMule-2.2.2/src/ServerList.cpp.orig Fri Sep 26 23:34:57 2008
++++ aMule-2.2.2/src/ServerList.cpp Fri Sep 26 23:51:32 2008
+@@ -531,7 +531,7 @@
+
+ void CServerList::Sort()
+ {
+- m_servers.sort(ServerPriorityComparator());
++ m_servers.sort();
+ // Once the list has been sorted, it doesn't really make sense to continue
+ // traversing the new order from the old position. Plus, there's a bug in
+ // version of libstdc++ before gcc4 such that iterators that were equal to
+@@ -877,7 +877,7 @@
+
+ EventType::ValueList ilist;
+ ilist.reserve( m_servers.size() );
+- ilist.assign( m_servers.begin(), m_servers.end() );
++ ilist.assign( m_servers.size(), *m_servers.begin() );
+
+ NotifyObservers( EventType( EventType::INITIAL, &ilist ), o );
+ }
+@@ -916,7 +916,7 @@
+ {
+ std::vector<const CServer*> result;
+ result.reserve(m_servers.size());
+- result.assign(m_servers.begin(), m_servers.end());
++ result.assign(m_servers.size(), *m_servers.begin());
+ return result;
+ }
+
+--- aMule-2.2.2/src/kademlia/net/KademliaUDPListener.cpp.orig Fri Sep 26 23:53:28 2008
++++ aMule-2.2.2/src/kademlia/net/KademliaUDPListener.cpp Fri Sep 26 23:55:22 2008
+@@ -70,6 +70,9 @@
+
+ #define THIS_DEBUG_IS_JUST_FOR_KRY_DONT_TOUCH_IT_KTHX 0
+
++#if defined(__SUNPRO_CC)
++#define __FUNCTION__ __FILE__+__LINE__
++#endif
+
+ #define CHECK_PACKET_SIZE(OP, SIZE) \
+ if (lenPacket OP (uint32_t)(SIZE)) \
+--- aMule-2.2.2/src/UPnPBase.h.orig Fri Sep 26 18:55:28 2008
++++ aMule-2.2.2/src/UPnPBase.h Fri Sep 26 23:56:53 2008
+@@ -157,7 +157,7 @@
+ * UPnPLib explicitly, making this dlopen() stuff unnecessary.
+ */
+ template <typename T, char const *XML_ELEMENT_NAME, char const *XML_LIST_NAME>
+-class CXML_List : public std::map<const std::string, T *>
++class CXML_List : public std::map<std::string, T *>
+ {
+ public:
+ CXML_List(
+@@ -204,31 +204,43 @@
+ }
+
+ #ifdef UPNP_C
+- char s_argument[] = "argument";
+- char s_argumentList[] = "argumentList";
+- char s_action[] = "action";
+- char s_actionList[] = "actionList";
+- char s_allowedValue[] = "allowedValue";
+- char s_allowedValueList[] = "allowedValueList";
+- char s_stateVariable[] = "stateVariable";
+- char s_serviceStateTable[] = "serviceStateTable";
+- char s_service[] = "service";
+- char s_serviceList[] = "serviceList";
+- char s_device[] = "device";
+- char s_deviceList[] = "deviceList";
++ extern const char s_argument[];
++ extern const char s_argumentList[];
++ extern const char s_action[];
++ extern const char s_actionList[];
++ extern const char s_allowedValue[];
++ extern const char s_allowedValueList[];
++ extern const char s_stateVariable[];
++ extern const char s_serviceStateTable[];
++ extern const char s_service[];
++ extern const char s_serviceList[];
++ extern const char s_device[];
++ extern const char s_deviceList[];
++ const char s_argument[] = "argument";
++ const char s_argumentList[] = "argumentList";
++ const char s_action[] = "action";
++ const char s_actionList[] = "actionList";
++ const char s_allowedValue[] = "allowedValue";
++ const char s_allowedValueList[] = "allowedValueList";
++ const char s_stateVariable[] = "stateVariable";
++ const char s_serviceStateTable[] = "serviceStateTable";
++ const char s_service[] = "service";
++ const char s_serviceList[] = "serviceList";
++ const char s_device[] = "device";
++ const char s_deviceList[] = "deviceList";
+ #else // UPNP_C
+- extern char s_argument[];
+- extern char s_argumentList[];
+- extern char s_action[];
+- extern char s_actionList[];
+- extern char s_allowedValue[];
+- extern char s_allowedValueList[];
+- extern char s_stateVariable[];
+- extern char s_serviceStateTable[];
+- extern char s_service[];
+- extern char s_serviceList[];
+- extern char s_device[];
+- extern char s_deviceList[];
++ extern const char s_argument[];
++ extern const char s_argumentList[];
++ extern const char s_action[];
++ extern const char s_actionList[];
++ extern const char s_allowedValue[];
++ extern const char s_allowedValueList[];
++ extern const char s_stateVariable[];
++ extern const char s_serviceStateTable[];
++ extern const char s_service[];
++ extern const char s_serviceList[];
++ extern const char s_device[];
++ extern const char s_deviceList[];
+ #endif // UPNP_C
+
+
+@@ -546,9 +558,9 @@
+ };
+
+
+-typedef std::map<const std::string, CUPnPRootDevice *> RootDeviceMap;
+-typedef std::map<const std::string, CUPnPService *> ServiceMap;
+-typedef std::map<const std::string, CUPnPPortMapping> PortMappingMap;
++typedef std::map<std::string, CUPnPRootDevice *> RootDeviceMap;
++typedef std::map<std::string, CUPnPService *> ServiceMap;
++typedef std::map<std::string, CUPnPPortMapping> PortMappingMap;
+
+
+ class CUPnPControlPoint
+--- aMule-2.2.2/src/PrefsUnifiedDlg.cpp.orig Fri Sep 26 23:57:58 2008
++++ aMule-2.2.2/src/PrefsUnifiedDlg.cpp Fri Sep 26 23:59:08 2008
+@@ -516,7 +516,7 @@
+ if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
+ CastChild(IDC_AUTOSERVER, wxCheckBox)->IsChecked() ) {
+ thePrefs::UnsetAutoServerStart();
+- wxMessageBox(wxString::wxString( _("Your Auto-update server list is empty.\n'Auto-update server list at startup will be disabled.")),
++ wxMessageBox(_("Your Auto-update server list is empty.\n'Auto-update server list at startup will be disabled."),
+ _("Message"), wxOK | wxICON_INFORMATION, this);
+ }
+
+@@ -606,8 +606,8 @@
+ }
+
+ if (!thePrefs::GetNetworkED2K() && !thePrefs::GetNetworkKademlia()) {
+- wxMessageBox(wxString::wxString(
+- _("Both eD2k and Kad network are disabled.\nYou won't be able to connect until you enable at least one of them.")));
++ wxMessageBox(
++ _("Both eD2k and Kad network are disabled.\nYou won't be able to connect until you enable at least one of them."));
+ }
+
+ if (thePrefs::GetNetworkKademlia() && thePrefs::IsUDPDisabled()) {
+@@ -698,7 +698,7 @@
+ case IDC_AUTOSERVER:
+ if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
+ CastChild(event.GetId(), wxCheckBox)->IsChecked() ) {
+- wxMessageBox(wxString::wxString( _("Your Auto-update servers list is in blank.\nPlease fill in at least one URL to point to a valid server.met file.\nClick on the button \"List\" by this checkbox to enter an URL.")),
++ wxMessageBox(_("Your Auto-update servers list is in blank.\nPlease fill in at least one URL to point to a valid server.met file.\nClick on the button \"List\" by this checkbox to enter an URL."),
+ _("Message"), wxOK | wxICON_INFORMATION);
+ CastChild(event.GetId(), wxCheckBox)->SetValue(false);
+ }
+--- aMule-2.2.2/src/extern/wxWidgets/listctrl.cpp.orig Sat Sep 27 00:03:07 2008
++++ aMule-2.2.2/src/extern/wxWidgets/listctrl.cpp Sat Sep 27 00:04:09 2008
+@@ -94,6 +94,8 @@
+ // the space between the image and the text in the report mode in header
+ static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
+
++const wxChar wxListCtrlNameStr[] = wxT("listCtrl");
++
+ // ============================================================================
+ // private classes
+ // ============================================================================
+--- aMule-2.2.2/src/OtherStructs.h.orig Sat Sep 27 00:07:16 2008
++++ aMule-2.2.2/src/OtherStructs.h Sat Sep 27 00:06:45 2008
+@@ -33,7 +33,7 @@
+
+
+ // SERVER TO CLIENT
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ #pragma pack(1)
+ #endif
+ struct Header_Struct{
+@@ -41,7 +41,7 @@
+ int32 packetlength;
+ int8 command;
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+@@ -48,7 +48,7 @@
+ __attribute__((__packed__));
+ #endif
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ #pragma pack(1)
+ #endif
+ struct UDP_Header_Struct {
+@@ -55,7 +55,7 @@
+ int8 eDonkeyID;
+ int8 command;
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+@@ -62,7 +62,7 @@
+ __attribute__((__packed__));
+ #endif
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack(1)
+ #endif
+@@ -73,7 +73,7 @@
+ unsigned char FileID[16];
+ uint32 transferred; // Barry - This counts bytes completed
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+@@ -85,7 +85,7 @@
+ uint32 lastasked;
+ uint8 badrequests;
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+@@ -105,7 +105,7 @@
+ uint64 end;
+ };
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ #pragma pack(1)
+ #endif
+ struct ServerMet_Struct {
+@@ -113,7 +113,7 @@
+ uint16 port;
+ uint32 tagcount;
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+@@ -128,7 +128,7 @@
+
+ //Kry import of 0.30d
+ // Maella -Enhanced Chunk Selection- (based on jicxicmic)
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ #pragma pack(1)
+ #endif
+ struct Chunk {
+@@ -138,7 +138,7 @@
+ uint16 rank; // Download priority factor (highest = 0, lowest = 0xffff)
+ };
+ }
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__SUNPRO_CC)
+ ;
+ #pragma pack()
+ #else
+--- aMule-2.2.2/src/SafeFile.cpp.orig Fri Sep 26 18:53:06 2008
++++ aMule-2.2.2/src/SafeFile.cpp Sat Sep 27 00:23:28 2008
+@@ -28,6 +28,9 @@
+ #include "kademlia/utils/UInt128.h" // Needed for CUInt128
+ #include "ScopedPtr.h" // Needed for CScopedPtr and CScopedArray
+
++#if defined(__SUNPRO_CC)
++#define __FUNCTION__ __FILE__+__LINE__
++#endif
+
+ #define CHECK_BOM(size, x) ((size >= 3) && (x[0] == (char)0xEF) && (x[1] == (char)0xBB) && (x[2] == (char)0xBF))
+
+--- aMule-2.2.2/src/kademlia/kademlia/SearchManager.cpp.orig Fri Sep 26 18:27:51 2008
++++ aMule-2.2.2/src/kademlia/kademlia/SearchManager.cpp Sat Sep 27 00:25:52 2008
+@@ -49,6 +49,10 @@
+
+ #include <wx/tokenzr.h>
+
++#if defined(__SUNPRO_CC)
++#define __FUNCTION__ __FILE__+__LINE__
++#endif
++
+ ////////////////////////////////////////
+ using namespace Kademlia;
+ ////////////////////////////////////////
+--- aMule-2.2.2/src/Tag.cpp.orig Fri Sep 26 18:53:36 2008
++++ aMule-2.2.2/src/Tag.cpp Sat Sep 27 00:28:15 2008
+@@ -30,6 +30,10 @@
+ #include "SafeFile.h" // Needed for CFileDataIO
+ #include "MD4Hash.h" // Needed for CMD4Hash
+
++#if defined(__SUNPRO_CC)
++#define __FUNCTION__ __FILE__+__LINE__
++#endif
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // CTag
+
+--- aMule-2.2.2/src/DownloadQueue.cpp.orig Fri Sep 26 19:16:49 2008
++++ aMule-2.2.2/src/DownloadQueue.cpp Sat Sep 27 00:39:33 2008
+@@ -1452,7 +1452,7 @@
+ {
+ wxMutexLocker lock(m_mutex);
+ list.reserve( m_filelist.size() );
+- list.insert( list.begin(), m_filelist.begin(), m_filelist.end() );
++ list.insert( list.begin(), m_filelist.size(), *m_filelist.begin() );
+ }
+
+ NotifyObservers( EventType( EventType::INITIAL, &list ), o );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pr...@us...> - 2008-09-26 17:59:52
|
Revision: 1399
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1399&view=rev
Author: pradhap
Date: 2008-09-26 17:59:40 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
2008-09-26 Pradhap Devarajan <pradhap (at) gmail.com>
* SFEcheck.spec: Fix permission
Modified Paths:
--------------
spec-files-extra/trunk/SFEcheck.spec
Modified: spec-files-extra/trunk/SFEcheck.spec
===================================================================
--- spec-files-extra/trunk/SFEcheck.spec 2008-09-26 04:03:12 UTC (rev 1398)
+++ spec-files-extra/trunk/SFEcheck.spec 2008-09-26 17:59:40 UTC (rev 1399)
@@ -54,7 +54,7 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr (-, root, bin)
+%defattr (-, root, sys)
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/*
%dir %attr (0755, root, bin) %{_libdir}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-09-26 04:03:47
|
Revision: 1398
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1398&view=rev
Author: yippi
Date: 2008-09-26 04:03:12 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
2008-09-25 Brian Cameron <bri...@su...>
* SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
Bump to 0.5.11.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEelisa-plugins-bad.spec
spec-files-extra/trunk/SFEelisa-plugins-good.spec
spec-files-extra/trunk/SFEelisa.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-24 10:34:49 UTC (rev 1397)
+++ spec-files-extra/trunk/ChangeLog 2008-09-26 04:03:12 UTC (rev 1398)
@@ -1,3 +1,8 @@
+2008-09-25 Brian Cameron <bri...@su...>
+
+ * SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
+ Bump to 0.5.11.
+
2008-09-24 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec: Bump to 2.24.0.
Modified: spec-files-extra/trunk/SFEelisa-plugins-bad.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-24 10:34:49 UTC (rev 1397)
+++ spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-26 04:03:12 UTC (rev 1398)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-bad
-%define version 0.5.10
+%define version 0.5.11
%include Solaris.inc
@@ -79,6 +79,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Thu Sep 25 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa-plugins-good.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-24 10:34:49 UTC (rev 1397)
+++ spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-26 04:03:12 UTC (rev 1398)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-good
-%define version 0.5.10
+%define version 0.5.11
%include Solaris.inc
@@ -74,6 +74,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Thu Sep 25 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa.spec 2008-09-24 10:34:49 UTC (rev 1397)
+++ spec-files-extra/trunk/SFEelisa.spec 2008-09-26 04:03:12 UTC (rev 1398)
@@ -11,7 +11,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa
-%define version 0.5.10
+%define version 0.5.11
%include Solaris.inc
@@ -116,6 +116,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_generic_setup.pyc
%changelog
+* Thu Sep 25 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.11.
* Wed Sep 17 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2008-09-24 10:35:16
|
Revision: 1397
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1397&view=rev
Author: simonzheng
Date: 2008-09-24 10:34:49 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
2008-09-24 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec: Bump to 2.24.0.
* patches/gdm-05-crash.diff:
* patches/gdm-07-gconfsanity.diff:
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
Removed Paths:
-------------
spec-files-extra/trunk/patches/gdm-05-crash.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-24 08:53:00 UTC (rev 1396)
+++ spec-files-extra/trunk/ChangeLog 2008-09-24 10:34:49 UTC (rev 1397)
@@ -1,3 +1,9 @@
+2008-09-24 simon.zheng <sim...@su...>
+
+ * SUNWgnome-display-mgr.spec: Bump to 2.24.0.
+ * patches/gdm-05-crash.diff:
+ * patches/gdm-07-gconfsanity.diff:
+
2008-09-24 Alfred Peng <alf...@su...>
Correct a conditional statement error in the patch.
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-24 08:53:00 UTC (rev 1396)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-24 10:34:49 UTC (rev 1397)
@@ -13,9 +13,9 @@
Summary: GNOME display manager
Name: SUNWgnome-display-mgr
-Version: 2.23.92
+Version: 2.24.0
Release: 1
-Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.23/gdm-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.24/gdm-%{version}.tar.bz2
Source1: gdm.xml
Source2: svc-gdm
# Fix language/locale. Patch by Takao. See bugzilla bug #536387.
@@ -30,9 +30,6 @@
Patch3: gdm-03-ctrun.diff
# Manage displays on the fly. Refer to bug #536355.
Patch4: gdm-04-dynamic-display.diff
-# Fix two issues gdm-simple-greeter crash and failure of login.
-# Status: upstream.
-Patch5: gdm-05-crash.diff
# Possible fix for unwritable gdm user $HOME. gnome-session
# tries to update ~/.ICEAuthority and gdm-simple-greeter crashes
# when looking up option widgets.
@@ -98,7 +95,6 @@
%patch2 -p0
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p0
%patch7 -p0
@@ -124,10 +120,6 @@
CPUS=1
fi
-export CFLAGS="$RPM_OPT_FLAGS"
-autoheader
-autoconf
-
ENABLE_CONSOLE_HELPER=
%ifos linux
ENABLE_CONSOLE_HELPER="--enable-console-helper"
@@ -140,9 +132,6 @@
RBAC_CONFIG="--enable-rbac-shutdown=solaris.system.shutdown"
%endif
-libtoolize --force
-glib-gettextize -c -f
-intltoolize --copy --force --automake
aclocal $ACLOCAL_FLAGS
autoconf
autoheader
@@ -321,6 +310,8 @@
%endif
%changelog
+* Wed Sep 24 2008 - sim...@su...
+- Bump to 2.24.0. Remove upstream 05-crash.diff.
* Wed Sep 17 2008 - bri...@su...
- Bump to 2.23.92.
* Fri Sep 05 2008 - sim...@su...
Deleted: spec-files-extra/trunk/patches/gdm-05-crash.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-05-crash.diff 2008-09-24 08:53:00 UTC (rev 1396)
+++ spec-files-extra/trunk/patches/gdm-05-crash.diff 2008-09-24 10:34:49 UTC (rev 1397)
@@ -1,12 +0,0 @@
---- gdm-2.23.92/data/Xsession.solaris-orig 2008-09-17 01:01:33.158880000 -0500
-+++ gdm-2.23.92/data/Xsession.solaris 2008-09-17 01:01:43.565237000 -0500
-@@ -20,7 +20,8 @@ export G_BROKEN_FILENAMES
- # G_FILENAME_ENCODING=@locale
- # export G_FILENAME_ENCODING
-
--export VTE_CJK_WIDTH=1
-+VTE_CJK_WIDTH=1
-+export VTE_CJK_WIDTH
-
- if [ "x$LANG" = "xzh" ] ; then
- export LANGUAGE=zh:zh_CN.EUC
Modified: spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-24 08:53:00 UTC (rev 1396)
+++ spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-24 10:34:49 UTC (rev 1397)
@@ -7,13 +7,3 @@
# override some settings
# we treat settings in this location as
---- data/Makefile.am.orig 2008-09-08 14:11:15.655240000 +0800
-+++ data/Makefile.am 2008-09-08 14:10:47.595552000 +0800
-@@ -226,6 +226,7 @@
- $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
- gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
- gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
-+ chmod -R +rx $(DESTDIR)$(workingdir)/.gconf.mandatory
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alf...@us...> - 2008-09-24 08:53:06
|
Revision: 1396
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1396&view=rev
Author: alfredpeng
Date: 2008-09-24 08:53:00 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
2008-09-24 Alfred Peng <alf...@su...>
Correct a conditional statement error in the patch.
* patches/filezilla-03-dirent-to-stat.diff:
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-24 05:43:10 UTC (rev 1395)
+++ spec-files-extra/trunk/ChangeLog 2008-09-24 08:53:00 UTC (rev 1396)
@@ -1,5 +1,10 @@
2008-09-24 Alfred Peng <alf...@su...>
+ Correct a conditional statement error in the patch.
+ * patches/filezilla-03-dirent-to-stat.diff:
+
+2008-09-24 Alfred Peng <alf...@su...>
+
Add two patches for build and bump to 3.1.3.
* base-specs/filezilla.spec:
* patches/filezilla-02-multimap-const.diff:
Modified: spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff
===================================================================
--- spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff 2008-09-24 05:43:10 UTC (rev 1395)
+++ spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff 2008-09-24 08:53:00 UTC (rev 1396)
@@ -32,7 +32,7 @@
continue;
}
- else if (entry->d_type != DT_DIR)
-+ else if (S_ISDIR(statbuf.st_mode))
++ else if (!S_ISDIR(statbuf.st_mode))
continue;
}
@@ -60,7 +60,7 @@
return true;
}
- else if (entry->d_type != DT_DIR)
-+ else if (S_ISDIR(statbuf.st_mode))
++ else if (!S_ISDIR(statbuf.st_mode))
continue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alf...@us...> - 2008-09-24 05:43:17
|
Revision: 1395
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1395&view=rev
Author: alfredpeng
Date: 2008-09-24 05:43:10 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
2008-09-24 Alfred Peng <alf...@su...>
Add two patches for build and bump to 3.1.3.
* base-specs/filezilla.spec:
* patches/filezilla-02-multimap-const.diff:
* patches/filezilla-03-dirent-to-stat.diff:
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/base-specs/filezilla.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/filezilla-02-multimap-const.diff
spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-23 16:52:03 UTC (rev 1394)
+++ spec-files-extra/trunk/ChangeLog 2008-09-24 05:43:10 UTC (rev 1395)
@@ -1,5 +1,12 @@
2008-09-24 Alfred Peng <alf...@su...>
+ Add two patches for build and bump to 3.1.3.
+ * base-specs/filezilla.spec:
+ * patches/filezilla-02-multimap-const.diff:
+ * patches/filezilla-03-dirent-to-stat.diff:
+
+2008-09-24 Alfred Peng <alf...@su...>
+
Backport the patch from trunk to build with Sun Studio.
* SFEgftp.spec:
* patches/gftp-01-solaris-in-trunk.diff:
Modified: spec-files-extra/trunk/base-specs/filezilla.spec
===================================================================
--- spec-files-extra/trunk/base-specs/filezilla.spec 2008-09-23 16:52:03 UTC (rev 1394)
+++ spec-files-extra/trunk/base-specs/filezilla.spec 2008-09-24 05:43:10 UTC (rev 1395)
@@ -4,19 +4,23 @@
# package are under the same license as the package itself.
#
# Owner: halton
-# bugdb: http://sourceforge.net/tracker/index.php?func=detail&group_id=21558&atid=372241&aid=
+# bugdb: http://trac.filezilla-project.org/wiki
#
-%define version_str 3.1.1.1_src
+%define version_str 3.1.3_src
Name: filezilla
Summary: FileZilla FTP client
-Version: 3.1.1.1
+Version: 3.1.3
License: GPL
URL: http://filezilla.sourceforge.net/
Source: http://superb-east.dl.sourceforge.net/sourceforge/filezilla/FileZilla_%{version_str}.tar.bz2
-# date:2008-03-06 owner:halton type:bug bugid:1908796
+# date:2008-03-06 owner:halton type:bug bugid:3424
Patch1: %{name}-01-msgfmt.diff
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# date:2008-09-23 owner:alfred type:bug bugid:3803
+Patch2: %{name}-02-multimap-const.diff
+# date:2008-09-23 owner:alfred type:bug bugid:3803
+Patch3: %{name}-03-dirent-to-stat.diff
%description
FileZilla is a fast and reliable FTP client and server with lots of
@@ -25,6 +29,8 @@
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%ifos linux
@@ -68,6 +74,9 @@
%changelog
+* Wed Sep 24 2008 - alf...@su...
+- Bump to 3.1.3.
+ Add two patches: multimap-const.diff and dirent-to-stat.diff.
* Fri Aug 29 2008 - alf...@su...
- Bump to 3.1.1.
- Remove upstreamed patches: iter++.diff, SetActive.diff and locale.diff.
Added: spec-files-extra/trunk/patches/filezilla-02-multimap-const.diff
===================================================================
--- spec-files-extra/trunk/patches/filezilla-02-multimap-const.diff (rev 0)
+++ spec-files-extra/trunk/patches/filezilla-02-multimap-const.diff 2008-09-24 05:43:10 UTC (rev 1395)
@@ -0,0 +1,20 @@
+--- filezilla-3.1.3/src/engine/directorylisting.cpp.orig Tue Sep 23 14:03:54 2008
++++ filezilla-3.1.3/src/engine/directorylisting.cpp Tue Sep 23 14:03:14 2008
+@@ -409,7 +409,7 @@
+ for (; entry_iter != m_pEntries->end(); entry_iter++, i++)
+ {
+ const wxString& entry_name = entry_iter->GetEntry().name;
+- m_searchmap_case->insert(std::pair<wxString, unsigned int>(entry_name, i));
++ m_searchmap_case->insert(std::pair<const wxString, unsigned int>(entry_name, i));
+
+ if (entry_name == name)
+ return i;
+@@ -439,7 +439,7 @@
+ {
+ wxString entry_name = entry_iter->GetEntry().name;
+ entry_name.MakeLower();
+- m_searchmap_nocase->insert(std::pair<wxString, unsigned int>(entry_name, i));
++ m_searchmap_nocase->insert(std::pair<const wxString, unsigned int>(entry_name, i));
+
+ if (entry_name == name)
+ return i;
Added: spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff
===================================================================
--- spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff (rev 0)
+++ spec-files-extra/trunk/patches/filezilla-03-dirent-to-stat.diff 2008-09-24 05:43:10 UTC (rev 1395)
@@ -0,0 +1,66 @@
+--- filezilla-3.1.3/src/engine/local_filesys.cpp.orig 2008-09-23 17:26:27.765718000 +0800
++++ filezilla-3.1.3/src/engine/local_filesys.cpp 2008-09-23 17:37:55.499130000 +0800
+@@ -363,7 +363,7 @@
+
+ const wxCharBuffer p = path.fn_str();
+ const int len = strlen(p);
+- m_raw_path = new char[len + NAME_MAX + 2];
++ m_raw_path = new char[len + _POSIX_NAME_MAX + 2];
+ strcpy(m_raw_path, p);
+ if (len > 1)
+ {
+@@ -427,6 +427,7 @@
+ return false;
+
+ struct dirent* entry;
++ struct stat statbuf;
+ while ((entry = readdir(m_dir)))
+ {
+ if (!entry->d_name[0] ||
+@@ -436,14 +437,16 @@
+
+ if (m_dirs_only)
+ {
+- if (entry->d_type == DT_LNK)
++ if (stat(entry->d_name, &statbuf) == -1)
++ continue;
++ if (S_ISLNK(statbuf.st_mode))
+ {
+ bool wasLink;
+ strcpy(m_file_part, entry->d_name);
+ if (GetFileInfo(m_raw_path, wasLink, 0, 0, 0) != dir)
+ continue;
+ }
+- else if (entry->d_type != DT_DIR)
++ else if (S_ISDIR(statbuf.st_mode))
+ continue;
+ }
+
+@@ -505,6 +508,7 @@
+ return false;
+
+ struct dirent* entry;
++ struct stat statbuf;
+ while ((entry = readdir(m_dir)))
+ {
+ if (!entry->d_name[0] ||
+@@ -514,7 +518,9 @@
+
+ if (m_dirs_only)
+ {
+- if (entry->d_type == DT_LNK)
++ if (stat(entry->d_name, &statbuf) == -1)
++ continue;
++ if (S_ISLNK(statbuf.st_mode))
+ {
+ strcpy(m_file_part, entry->d_name);
+ enum local_fileType type = GetFileInfo(m_raw_path, isLink, size, modificationTime, mode);
+@@ -525,7 +531,7 @@
+ is_dir = type == dir;
+ return true;
+ }
+- else if (entry->d_type != DT_DIR)
++ else if (S_ISDIR(statbuf.st_mode))
+ continue;
+ }
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alf...@us...> - 2008-09-23 16:52:18
|
Revision: 1394
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1394&view=rev
Author: alfredpeng
Date: 2008-09-23 16:52:03 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
2008-09-24 Alfred Peng <alf...@su...>
Backport the patch from trunk to build with Sun Studio.
* SFEgftp.spec:
* patches/gftp-01-solaris-in-trunk.diff:
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEgftp.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/gftp-01-solaris-in-trunk.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-22 09:52:22 UTC (rev 1393)
+++ spec-files-extra/trunk/ChangeLog 2008-09-23 16:52:03 UTC (rev 1394)
@@ -1,3 +1,9 @@
+2008-09-24 Alfred Peng <alf...@su...>
+
+ Backport the patch from trunk to build with Sun Studio.
+ * SFEgftp.spec:
+ * patches/gftp-01-solaris-in-trunk.diff:
+
2008-09-22 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec:
Modified: spec-files-extra/trunk/SFEgftp.spec
===================================================================
--- spec-files-extra/trunk/SFEgftp.spec 2008-09-22 09:52:22 UTC (rev 1393)
+++ spec-files-extra/trunk/SFEgftp.spec 2008-09-23 16:52:03 UTC (rev 1394)
@@ -10,15 +10,11 @@
Source: http://gftp.seul.org/gftp-%{version}.tar.bz2
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
+# date:2008-09-23 owner:alfred type:up-streamed
+Patch1: gftp-01-solaris-in-trunk.diff
-%package devel
-Summary: %{summary} - development files
-SUNW_BaseDir: %{_basedir}
%include default-depend.inc
-Requires: %name
-
%if %build_l10n
%package l10n
Summary: %{summary} - l10n files
@@ -29,6 +25,7 @@
%prep
%setup -q -n gftp-%version
+%patch1 -p1
%build
export LDFLAGS="-lX11"
@@ -38,7 +35,7 @@
#TODO: check --disable-sm
CC=$CC CXX=$CXX CFLAGS="$CFLAGS" ./configure --prefix=%{_prefix} \
- --disable-sm
+ --mandir=%{_prefix}/share/man --disable-sm
make
%install
@@ -47,7 +44,7 @@
%if %{build_l10n}
%else
-rmdir $RPM_BUILD_ROOT/%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
%endif
%clean
@@ -55,28 +52,19 @@
%files
%defattr(-, root, bin)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
+%doc README ChangeLog COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
-%dir %attr (0755, root, other) %{_datadir}/gmpc
-%{_datadir}/gmpc/*
+%dir %attr (0755, root, other) %{_datadir}/gftp
+%{_datadir}/gftp/*
+%dir %attr (0755, root, other) %{_datadir}/man
+%{_datadir}/man/*
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-
-
-%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-
-
%if %build_l10n
%files l10n
%defattr (-, root, bin)
@@ -84,8 +72,10 @@
%attr (-, root, other) %{_datadir}/locale
%endif
-
%changelog
+* Wed Sep 24 2008 - alf...@su...
+- Backport the patch gftp-01-solaris-in-trunk.diff from trunk to build
+ with Sun Studio.
* Tue Sep 04 2007 - Thomas Wagner
- bump to 0.15.1, add %{version} to Download-Dir (might change again)
- conditional !%build_l10n rmdir $RPM_BUILD_ROOT/%{_datadir}/locale
Added: spec-files-extra/trunk/patches/gftp-01-solaris-in-trunk.diff
===================================================================
--- spec-files-extra/trunk/patches/gftp-01-solaris-in-trunk.diff (rev 0)
+++ spec-files-extra/trunk/patches/gftp-01-solaris-in-trunk.diff 2008-09-23 16:52:03 UTC (rev 1394)
@@ -0,0 +1,57 @@
+--- gftp-2.0.18/lib/fsplib/fsplib.c.orig Wed Sep 24 00:25:05 2008
++++ gftp-2.0.18/lib/fsplib/fsplib.c Wed Sep 24 00:25:17 2008
+@@ -591,13 +591,6 @@
+ if (rc != 0)
+ return rc;
+
+- /* convert FSP dirent to OS dirent */
+-
+- if (fentry.type == FSP_RDTYPE_DIR )
+- entry->d_type=DT_DIR;
+- else
+- entry->d_type=DT_REG;
+-
+ /* remove symlink destination */
+ c=strchr(fentry.name,'\n');
+ if (c)
+@@ -608,7 +601,6 @@
+ fentry.namlen-=rc;
+ }
+
+- entry->d_fileno = 10;
+ entry->d_reclen = fentry.reclen;
+ strncpy(entry->d_name,fentry.name,MAXNAMLEN);
+
+--- gftp-2.0.18/lib/fsplib/lock.c.orig Wed Sep 24 00:27:26 2008
++++ gftp-2.0.18/lib/fsplib/lock.c Wed Sep 24 00:26:50 2008
+@@ -2,6 +2,10 @@
+ #include <stdio.h>
+ #include "lock.h"
+
++#if defined(__NetBSD__) || defined(sun) || defined(hpux)
++#define _SEM_SEMUN_UNDEFINED /**/
++#endif
++
+ /* ************ Locking functions ***************** */
+ #ifndef FSP_NOLOCKING
+
+@@ -91,7 +95,7 @@
+ mode_t omask;
+ key_t lock_key;
+ int fd;
+- union semun sun;
++ union semun su;
+ struct sembuf sem;
+
+ make_key_string(lock,server_addr,server_port);
+@@ -123,8 +127,8 @@
+ return -1;
+ }
+ /* we need to init this semaphore */
+- sun.val=1;
+- if(semctl(lock->lock_sem,0,SETVAL,sun) == -1)
++ su.val=1;
++ if(semctl(lock->lock_sem,0,SETVAL,su) == -1)
+ {
+ perror("semctl setval");
+ return -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2008-09-22 09:52:48
|
Revision: 1393
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1393&view=rev
Author: simonzheng
Date: 2008-09-22 09:52:22 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
2008-09-22 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec:
* patches/gdm-06-ICE-optionwidget.diff: Fix for unwritable $HOME issues.
* patches/gdm-07-gconfsanity.diff: Fix for gconf-sanity-check warning.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-21 13:12:46 UTC (rev 1392)
+++ spec-files-extra/trunk/ChangeLog 2008-09-22 09:52:22 UTC (rev 1393)
@@ -1,3 +1,9 @@
+2008-09-22 simon.zheng <sim...@su...>
+
+ * SUNWgnome-display-mgr.spec:
+ * patches/gdm-06-ICE-optionwidget.diff: Fix for unwritable $HOME issues.
+ * patches/gdm-07-gconfsanity.diff: Fix for gconf-sanity-check warning.
+
2008-09-21 Dick Hoogendijk <di...@na...>
* SFEqt.spec: Bump to version 4.4.2
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-21 13:12:46 UTC (rev 1392)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-22 09:52:22 UTC (rev 1393)
@@ -30,8 +30,16 @@
Patch3: gdm-03-ctrun.diff
# Manage displays on the fly. Refer to bug #536355.
Patch4: gdm-04-dynamic-display.diff
-# Fix two issues gdm-simple-greeter crash and failure of login.
+# Fix two issues gdm-simple-greeter crash and failure of login.
+# Status: upstream.
Patch5: gdm-05-crash.diff
+# Possible fix for unwritable gdm user $HOME. gnome-session
+# tries to update ~/.ICEAuthority and gdm-simple-greeter crashes
+# when looking up option widgets.
+Patch6: gdm-06-ICE-optionwidget.diff
+# Fix gconf-santiy-check-2 warning dialog.
+# Please see http://bugzilla.gnome.org/show_bug.cgi?id=550832
+Patch7: gdm-07-gconfsanity.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -91,6 +99,8 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p0
+%patch7 -p0
%build
export LDFLAGS="%_ldflags -L/usr/openwin/lib -lXau -R/usr/openwin/lib -R/usr/sfw/lib"
@@ -260,7 +270,12 @@
%{_datadir}/gdm
%dir %attr (0755, root, other) %{_datadir}/gnome
%{_datadir}/gnome/help/gdm/C
-%attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/*
#%{_datadir}/omf/gdm/*-C.omf
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/gnome-2.0/*
Added: spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff 2008-09-22 09:52:22 UTC (rev 1393)
@@ -0,0 +1,27 @@
+--- daemon/gdm-welcome-session.c.orig 2008-09-06 18:40:04.753453000 +0800
++++ daemon/gdm-welcome-session.c 2008-09-06 18:42:20.633895000 +0800
+@@ -278,6 +278,8 @@
+
+ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (welcome_session->priv->x11_authority_file));
+ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (welcome_session->priv->x11_display_name));
++ /* Due to HOME dirctory of gdm user, use tmp dir instead */
++ g_hash_table_insert (hash, g_strdup ("ICEAUTHORITY"), g_strdup ("/tmp/.ICEauthority"));
+
+ #if 0
+ /* hackish ain't it */
+--- gui/simple-greeter/gdm-option-widget.c.orig 2008-09-08 16:25:23.929558000 +0800
++++ gui/simple-greeter/gdm-option-widget.c 2008-09-08 16:30:11.180315000 +0800
+@@ -281,9 +281,10 @@
+ const char *item)
+ {
+ g_return_if_fail (GDM_IS_OPTION_WIDGET (widget));
+- g_return_if_fail (item == NULL ||
+- gdm_option_widget_lookup_item (widget, item,
+- NULL, NULL, NULL));
++ if ((item != NULL &&
++ ! gdm_option_widget_lookup_item (widget, item,
++ NULL, NULL, NULL)))
++ return;
+
+ if (widget->priv->default_item_id == NULL ||
+ item == NULL ||
Added: spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-22 09:52:22 UTC (rev 1393)
@@ -0,0 +1,19 @@
+--- data/gconf.path.orig 2008-09-08 14:11:27.378093000 +0800
++++ data/gconf.path 2008-09-08 14:11:35.518684000 +0800
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++# xml:readonly:/etc/gconf/gconf.xml.system
+
+ # override some settings
+ # we treat settings in this location as
+--- data/Makefile.am.orig 2008-09-08 14:11:15.655240000 +0800
++++ data/Makefile.am 2008-09-08 14:10:47.595552000 +0800
+@@ -226,6 +226,7 @@
+ $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
++ chmod -R +rx $(DESTDIR)$(workingdir)/.gconf.mandatory
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2008-09-21 13:13:13
|
Revision: 1392
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1392&view=rev
Author: shinsui
Date: 2008-09-21 13:12:46 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
2008-09-21 Dick Hoogendijk <di...@na...>
SFEqt.spec: bump to version 4.4.2
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEqt.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-19 09:42:53 UTC (rev 1391)
+++ spec-files-extra/trunk/ChangeLog 2008-09-21 13:12:46 UTC (rev 1392)
@@ -1,3 +1,6 @@
+2008-09-21 Dick Hoogendijk <di...@na...>
+ * SFEqt.spec: Bump to version 4.4.2
+
2008-09-19 Jerry Yu <jij...@su...>
* SFEpython-pymetar.spec: Initial spec.
Modified: spec-files-extra/trunk/SFEqt.spec
===================================================================
--- spec-files-extra/trunk/SFEqt.spec 2008-09-19 09:42:53 UTC (rev 1391)
+++ spec-files-extra/trunk/SFEqt.spec 2008-09-21 13:12:46 UTC (rev 1392)
@@ -5,13 +5,13 @@
%include Solaris.inc
-%define tarball_version 4.4.0
+%define tarball_version 4.4.2
Name: SFEqt
Summary: Cross-platform development framework/toolkit
URL: http://trolltech.com/products/qt
License: GPL v2
-Version: 4.4.0
+Version: 4.4.2
Source: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{tarball_version}.tar.bz2
SUNW_BaseDir: %{_basedir}
@@ -97,6 +97,8 @@
%{_datadir}/doc/*
%changelog
+* Sun Sep 21 2008 - di...@na...
+- Bump to 4.4.2
* Tue May 13 2008 - no...@us...
- Bump to 4.4.0
* Fri Mar 21 2008 - no...@us...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-09-19 02:42:46
|
Revision: 1391
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1391&view=rev
Author: jerryyu
Date: 2008-09-19 09:42:53 +0000 (Fri, 19 Sep 2008)
Log Message:
-----------
* SFEpython-pymetar.spec: Initial spec.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
Added Paths:
-----------
spec-files-extra/trunk/SFEpython-pymetar.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-18 10:27:02 UTC (rev 1390)
+++ spec-files-extra/trunk/ChangeLog 2008-09-19 09:42:53 UTC (rev 1391)
@@ -1,3 +1,7 @@
+2008-09-19 Jerry Yu <jij...@su...>
+
+ * SFEpython-pymetar.spec: Initial spec.
+
2008-09-18 Jerry Yu <jij...@su...>
* SFEladspa-swh-plugins.spec: Add patch -03-locale.diff
Added: spec-files-extra/trunk/SFEpython-pymetar.spec
===================================================================
--- spec-files-extra/trunk/SFEpython-pymetar.spec (rev 0)
+++ spec-files-extra/trunk/SFEpython-pymetar.spec 2008-09-19 09:42:53 UTC (rev 1391)
@@ -0,0 +1,50 @@
+#
+# spec file for package SUNWpython-pymetar
+#
+# Copyright 2008 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: SFEpython-pymetar
+
+Summary: A library downloads the weather report
+URL: http://www.schwarzvogel.de/software-pymetar.shtml
+Version: 0.13
+Source: http://www.schwarzvogel.de/pkgs/pymetar-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: SUNWPython
+
+%include default-depend.inc
+
+%define pythonver 2.4
+
+%prep
+%setup -q -n pymetar-%{version}
+
+%build
+python setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python setup.py install --root=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_docdir}
+%{_docdir}/*
+
+%changelog
+* Fri Sep 19 2008 - jij...@su...
+- Initial version.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-09-18 10:26:55
|
Revision: 1390
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1390&view=rev
Author: jerryyu
Date: 2008-09-18 10:27:02 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
* SFEladspa-swh-plugins.spec: Add patch -03-locale.diff
* patches/swh-plugins-03-locale.diff:Added.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEladspa-swh-plugins.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/swh-plugins-03-locale.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-18 06:20:12 UTC (rev 1389)
+++ spec-files-extra/trunk/ChangeLog 2008-09-18 10:27:02 UTC (rev 1390)
@@ -1,5 +1,10 @@
2008-09-18 Jerry Yu <jij...@su...>
+ * SFEladspa-swh-plugins.spec: Add patch -03-locale.diff
+ * patches/swh-plugins-03-locale.diff:Added.
+
+2008-09-18 Jerry Yu <jij...@su...>
+
* SFEcodeina.spec: Correct one dependency
* base-specs/libsamplerate.spec: Bump to 0.1.4
Modified: spec-files-extra/trunk/SFEladspa-swh-plugins.spec
===================================================================
--- spec-files-extra/trunk/SFEladspa-swh-plugins.spec 2008-09-18 06:20:12 UTC (rev 1389)
+++ spec-files-extra/trunk/SFEladspa-swh-plugins.spec 2008-09-18 10:27:02 UTC (rev 1390)
@@ -12,6 +12,7 @@
Source: http://plugin.org.uk/releases/%{version}/swh-plugins-%{version}.tar.gz
Patch1: swh-plugins-01-nowall.diff
Patch2: swh-plugins-02-fixinline.diff
+Patch3: swh-plugins-03-locale.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,6 +28,7 @@
%patch1 -p1
%patch2 -p1
+%patch3 -p1
touch NEWS README AUTHORS ChangeLog COPYING
@@ -66,7 +68,14 @@
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %dir %{_datadir}/ladspa
%{_datadir}/ladspa/*
+%dir %attr (0755, root, other) %dir %{_datadir}/locale
+%dir %attr (0755, root, other) %dir %{_datadir}/locale/en_GB
+%dir %attr (0755, root, other) %dir %{_datadir}/locale/en_GB/LC_MESSAGES
+%{_datadir}/locale/en_GB/LC_MESSAGES/*
%changelog
+* Thu Sep 18 2008 - jij...@su...
+- Add patch -03-locale.diff.
+- Add files to %files.
* Mon Mar 17 2008 - bri...@su...
- Created with version 0.4.15
Added: spec-files-extra/trunk/patches/swh-plugins-03-locale.diff
===================================================================
--- spec-files-extra/trunk/patches/swh-plugins-03-locale.diff (rev 0)
+++ spec-files-extra/trunk/patches/swh-plugins-03-locale.diff 2008-09-18 10:27:02 UTC (rev 1390)
@@ -0,0 +1,11 @@
+--- swh-plugins-0.4.15/ladspa.h.orig 2008-09-18 17:58:02.796992000 +0800
++++ swh-plugins-0.4.15/ladspa.h 2008-09-18 17:59:14.268466000 +0800
+@@ -26,6 +26,8 @@
+ extern "C" {
+ #endif
+
++#include <locale.h>
++
+ /*****************************************************************************/
+
+ /* Overview:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-09-18 06:20:07
|
Revision: 1389
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1389&view=rev
Author: jerryyu
Date: 2008-09-18 06:20:12 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
* SFEcodeina.spec: Correct one dependency
* base-specs/libsamplerate.spec: Bump to 0.1.4
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEcodeina.spec
spec-files-extra/trunk/base-specs/libsamplerate.spec
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-18 05:15:03 UTC (rev 1388)
+++ spec-files-extra/trunk/ChangeLog 2008-09-18 06:20:12 UTC (rev 1389)
@@ -1,5 +1,10 @@
2008-09-18 Jerry Yu <jij...@su...>
+ * SFEcodeina.spec: Correct one dependency
+ * base-specs/libsamplerate.spec: Bump to 0.1.4
+
+2008-09-18 Jerry Yu <jij...@su...>
+
* SFEpython-cssutils.spec:Correct the summary.
2008-09-18 simon.zheng <sim...@su...>
Modified: spec-files-extra/trunk/SFEcodeina.spec
===================================================================
--- spec-files-extra/trunk/SFEcodeina.spec 2008-09-18 05:15:03 UTC (rev 1388)
+++ spec-files-extra/trunk/SFEcodeina.spec 2008-09-18 06:20:12 UTC (rev 1389)
@@ -48,11 +48,11 @@
Requires: SUNWgst-python
Requires: SFEpyopenssl
Requires: SFEpyyaml
-Requires: SFEnotify-python
+Requires: SUNWpython-notify
BuildRequires: SUNWPython-devel >= %{pythonver}
BuildRequires: SUNWgst-python
BuildRequires: SFEpyyaml
-BuildRequires: SFEnotify-python
+BuildRequires: SUNWpython-notify
BuildRequires: SFEpyopenssl
%include default-depend.inc
@@ -146,6 +146,8 @@
%endif
%changelog
+* Thu Sep 18 2008 - jij...@su...
+- Correct one dependency to SUNWpython-notify.
* Wed Jun 11 2008 - bri...@su...
- Bump to the latest 0.10.3.1 version.
* Thu Apr 10 2008 - bri...@su...
Modified: spec-files-extra/trunk/base-specs/libsamplerate.spec
===================================================================
--- spec-files-extra/trunk/base-specs/libsamplerate.spec 2008-09-18 05:15:03 UTC (rev 1388)
+++ spec-files-extra/trunk/base-specs/libsamplerate.spec 2008-09-18 06:20:12 UTC (rev 1389)
@@ -8,7 +8,7 @@
Name: SFElibsamplerate
Summary: libsamplerate - Sample Rate Converter for audio
-Version: 0.1.3
+Version: 0.1.4
Source: %{src_url}/%{src_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,6 +40,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Sep 18 2008 - Jij...@su...
+- Bump to 0.1.4.
* Mon May 05 2008 - bri...@su...
- Bump to 0.1.3.
* Sun Aug 12 2007 - do...@tr...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2008-09-18 03:33:53
|
Revision: 1387
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1387&view=rev
Author: simonzheng
Date: 2008-09-18 03:34:03 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
2008-09-18 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec:
* patches/gdm-04-dynamic-display.diff: Reworked.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-17 11:13:50 UTC (rev 1386)
+++ spec-files-extra/trunk/ChangeLog 2008-09-18 03:34:03 UTC (rev 1387)
@@ -1,3 +1,8 @@
+2008-09-18 simon.zheng <sim...@su...>
+
+ * SUNWgnome-display-mgr.spec:
+ * patches/gdm-04-dynamic-display.diff: Reworked.
+
2008-09-17 Brian Cameron <bri...@su...>
* SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-17 11:13:50 UTC (rev 1386)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-18 03:34:03 UTC (rev 1387)
@@ -89,7 +89,7 @@
%patch1 -p1
%patch2 -p0
%patch3 -p1
-#%patch4 -p1
+%patch4 -p1
%patch5 -p1
%build
Modified: spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff 2008-09-17 11:13:50 UTC (rev 1386)
+++ spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff 2008-09-18 03:34:03 UTC (rev 1387)
@@ -1,6 +1,6 @@
-diff -Nur gdm-2.23.2-orig/daemon/Makefile.am gdm-2.23.2/daemon/Makefile.am
---- gdm-2.23.2-orig/daemon/Makefile.am 2008-08-12 11:14:49.378597000 +0800
-+++ gdm-2.23.2/daemon/Makefile.am 2008-08-12 11:17:04.410714000 +0800
+diff -Nur gdm-2.23.92/daemon/Makefile.am gdm-2.23.92-new/daemon/Makefile.am
+--- gdm-2.23.92/daemon/Makefile.am 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/Makefile.am 2008-09-18 10:42:55.095234000 +0800
@@ -300,6 +300,8 @@
gdm-static-display.h \
gdm-transient-display.c \
@@ -10,9 +10,9 @@
gdm-static-factory-display.c \
gdm-static-factory-display.h \
gdm-product-display.c \
-diff -Nur gdm-2.23.2-orig/daemon/gdm-display.c gdm-2.23.2/daemon/gdm-display.c
---- gdm-2.23.2-orig/daemon/gdm-display.c 2008-08-12 11:14:49.356323000 +0800
-+++ gdm-2.23.2/daemon/gdm-display.c 2008-08-12 11:17:04.411734000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-display.c gdm-2.23.92-new/daemon/gdm-display.c
+--- gdm-2.23.92/daemon/gdm-display.c 2008-09-09 07:00:51.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-display.c 2008-09-18 10:49:57.112393000 +0800
@@ -58,6 +58,8 @@
GTimer *slave_timer;
char *slave_command;
@@ -30,9 +30,9 @@
};
static void gdm_display_class_init (GdmDisplayClass *klass);
-@@ -483,7 +486,18 @@
- G_CALLBACK (slave_died),
- display);
+@@ -491,7 +494,18 @@
+ gdm_slave_proxy_set_log_path (display->priv->slave_proxy, log_path);
+ g_free (log_path);
- command = g_strdup_printf ("%s --display-id %s",
+ /* Use --xserver-command only when custom Xserver is
@@ -46,11 +46,11 @@
+ display->priv->id,
+ display->priv->xserver_command);
+ else
-+ command = g_strdup_printf ("%s --display-id %s",
++ command = g_strdup_printf ("%s --display-id %s",
display->priv->slave_command,
display->priv->id);
-
-@@ -703,6 +717,14 @@
+ gdm_slave_proxy_set_command (display->priv->slave_proxy, command);
+@@ -710,6 +724,14 @@
}
static void
@@ -65,7 +65,7 @@
gdm_display_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -740,6 +762,9 @@
+@@ -747,6 +769,9 @@
case PROP_SLAVE_COMMAND:
_gdm_display_set_slave_command (self, g_value_get_string (value));
break;
@@ -75,7 +75,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -788,6 +813,9 @@
+@@ -795,6 +820,9 @@
case PROP_SLAVE_COMMAND:
g_value_set_string (value, self->priv->slave_command);
break;
@@ -85,7 +85,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -970,6 +998,14 @@
+@@ -977,6 +1005,14 @@
G_MAXINT,
GDM_DISPLAY_UNMANAGED,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -100,7 +100,7 @@
g_type_class_add_private (klass, sizeof (GdmDisplayPrivate));
-@@ -1005,6 +1041,7 @@
+@@ -1012,6 +1048,7 @@
g_free (display->priv->x11_display_name);
g_free (display->priv->x11_cookie);
g_free (display->priv->slave_command);
@@ -108,7 +108,7 @@
if (display->priv->access_file != NULL) {
g_object_unref (display->priv->access_file);
-@@ -1016,7 +1053,7 @@
+@@ -1023,7 +1060,7 @@
if (display->priv->slave_timer != NULL) {
g_timer_destroy (display->priv->slave_timer);
@@ -117,9 +117,9 @@
G_OBJECT_CLASS (gdm_display_parent_class)->finalize (object);
}
-diff -Nur gdm-2.23.2-orig/daemon/gdm-dynamic-display.c gdm-2.23.2/daemon/gdm-dynamic-display.c
---- gdm-2.23.2-orig/daemon/gdm-dynamic-display.c 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.23.2/daemon/gdm-dynamic-display.c 2008-08-12 11:17:04.412187000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-dynamic-display.c gdm-2.23.92-new/daemon/gdm-dynamic-display.c
+--- gdm-2.23.92/daemon/gdm-dynamic-display.c 1970-01-01 08:00:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-dynamic-display.c 2008-09-18 10:42:55.096864000 +0800
@@ -0,0 +1,209 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -330,9 +330,9 @@
+
+ return GDM_DISPLAY (object);
+}
-diff -Nur gdm-2.23.2-orig/daemon/gdm-dynamic-display.h gdm-2.23.2/daemon/gdm-dynamic-display.h
---- gdm-2.23.2-orig/daemon/gdm-dynamic-display.h 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.23.2/daemon/gdm-dynamic-display.h 2008-08-12 11:17:04.412425000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-dynamic-display.h gdm-2.23.92-new/daemon/gdm-dynamic-display.h
+--- gdm-2.23.92/daemon/gdm-dynamic-display.h 1970-01-01 08:00:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-dynamic-display.h 2008-09-18 10:42:55.097101000 +0800
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -393,9 +393,9 @@
+G_END_DECLS
+
+#endif /* __GDM_DYNAMIC_DISPLAY_H */
-diff -Nur gdm-2.23.2-orig/daemon/gdm-local-display-factory.c gdm-2.23.2/daemon/gdm-local-display-factory.c
---- gdm-2.23.2-orig/daemon/gdm-local-display-factory.c 2008-08-12 11:14:49.359831000 +0800
-+++ gdm-2.23.2/daemon/gdm-local-display-factory.c 2008-08-12 11:17:04.413178000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-local-display-factory.c gdm-2.23.92-new/daemon/gdm-local-display-factory.c
+--- gdm-2.23.92/daemon/gdm-local-display-factory.c 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-local-display-factory.c 2008-09-18 10:42:55.097781000 +0800
@@ -34,6 +34,7 @@
#include "gdm-display-store.h"
#include "gdm-static-display.h"
@@ -629,9 +629,9 @@
static void
on_static_display_status_changed (GdmDisplay *display,
GParamSpec *arg1,
-diff -Nur gdm-2.23.2-orig/daemon/gdm-local-display-factory.h gdm-2.23.2/daemon/gdm-local-display-factory.h
---- gdm-2.23.2-orig/daemon/gdm-local-display-factory.h 2008-08-12 11:14:49.378371000 +0800
-+++ gdm-2.23.2/daemon/gdm-local-display-factory.h 2008-08-12 11:17:04.443656000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-local-display-factory.h gdm-2.23.92-new/daemon/gdm-local-display-factory.h
+--- gdm-2.23.92/daemon/gdm-local-display-factory.h 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-local-display-factory.h 2008-09-18 10:42:55.118771000 +0800
@@ -71,6 +71,21 @@
char **id,
GError **error);
@@ -654,9 +654,9 @@
G_END_DECLS
#endif /* __GDM_LOCAL_DISPLAY_FACTORY_H */
-diff -Nur gdm-2.23.2-orig/daemon/gdm-local-display-factory.xml gdm-2.23.2/daemon/gdm-local-display-factory.xml
---- gdm-2.23.2-orig/daemon/gdm-local-display-factory.xml 2008-08-12 11:14:49.358517000 +0800
-+++ gdm-2.23.2/daemon/gdm-local-display-factory.xml 2008-08-12 11:17:04.443927000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-local-display-factory.xml gdm-2.23.92-new/daemon/gdm-local-display-factory.xml
+--- gdm-2.23.92/daemon/gdm-local-display-factory.xml 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-local-display-factory.xml 2008-09-18 10:42:55.119001000 +0800
@@ -9,5 +9,17 @@
<method name="CreateTransientDisplay">
<arg name="id" direction="out" type="o"/>
@@ -675,10 +675,10 @@
+ </method>
</interface>
</node>
-diff -Nur gdm-2.23.2-orig/daemon/gdm-server.c gdm-2.23.2/daemon/gdm-server.c
---- gdm-2.23.2-orig/daemon/gdm-server.c 2008-08-12 11:14:49.358070000 +0800
-+++ gdm-2.23.2/daemon/gdm-server.c 2008-08-12 11:17:04.444641000 +0800
-@@ -754,6 +754,13 @@
+diff -Nur gdm-2.23.92/daemon/gdm-server.c gdm-2.23.92-new/daemon/gdm-server.c
+--- gdm-2.23.92/daemon/gdm-server.c 2008-09-18 10:56:45.783571000 +0800
++++ gdm-2.23.92-new/daemon/gdm-server.c 2008-09-18 10:42:55.123070000 +0800
+@@ -757,6 +757,13 @@
return TRUE;
}
@@ -692,7 +692,7 @@
static void
_gdm_server_set_display_name (GdmServer *server,
-@@ -797,6 +804,9 @@
+@@ -800,6 +807,9 @@
self = GDM_SERVER (object);
switch (prop_id) {
@@ -702,7 +702,7 @@
case PROP_DISPLAY_NAME:
_gdm_server_set_display_name (self, g_value_get_string (value));
break;
-@@ -826,6 +836,9 @@
+@@ -829,6 +839,9 @@
self = GDM_SERVER (object);
switch (prop_id) {
@@ -712,7 +712,7 @@
case PROP_DISPLAY_NAME:
g_value_set_string (value, self->priv->display_name);
break;
-@@ -907,6 +920,13 @@
+@@ -910,6 +923,13 @@
G_TYPE_INT);
g_object_class_install_property (object_class,
@@ -726,7 +726,7 @@
PROP_DISPLAY_NAME,
g_param_spec_string ("display-name",
"name",
-@@ -974,6 +994,9 @@
+@@ -977,6 +997,9 @@
gdm_server_stop (server);
@@ -736,9 +736,9 @@
G_OBJECT_CLASS (gdm_server_parent_class)->finalize (object);
}
-diff -Nur gdm-2.23.2-orig/daemon/gdm-simple-slave.c gdm-2.23.2/daemon/gdm-simple-slave.c
---- gdm-2.23.2-orig/daemon/gdm-simple-slave.c 2008-08-12 11:14:49.354392000 +0800
-+++ gdm-2.23.2/daemon/gdm-simple-slave.c 2008-08-12 12:17:22.940161000 +0800
+diff -Nur gdm-2.23.92/daemon/gdm-simple-slave.c gdm-2.23.92-new/daemon/gdm-simple-slave.c
+--- gdm-2.23.92/daemon/gdm-simple-slave.c 2008-09-04 04:52:53.000000000 +0800
++++ gdm-2.23.92-new/daemon/gdm-simple-slave.c 2008-09-18 10:42:55.131389000 +0800
@@ -73,6 +73,8 @@
GPid server_pid;
guint connection_attempts;
@@ -756,7 +756,7 @@
};
static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass);
-@@ -1021,6 +1024,11 @@
+@@ -1035,6 +1038,11 @@
gboolean disable_tcp;
slave->priv->server = gdm_server_new (display_name, auth_file);
@@ -768,7 +768,7 @@
disable_tcp = TRUE;
if (gdm_settings_client_get_boolean (GDM_KEY_DISALLOW_TCP,
-@@ -1111,7 +1119,15 @@
+@@ -1125,7 +1133,15 @@
const GValue *value,
GParamSpec *pspec)
{
@@ -784,7 +784,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1124,7 +1140,14 @@
+@@ -1138,7 +1154,14 @@
GValue *value,
GParamSpec *pspec)
{
@@ -799,7 +799,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1161,6 +1184,15 @@
+@@ -1175,6 +1198,15 @@
g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate));
@@ -815,7 +815,7 @@
dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info);
}
-@@ -1188,6 +1220,7 @@
+@@ -1202,6 +1234,7 @@
g_source_remove (simple_slave->priv->greeter_reset_id);
simple_slave->priv->greeter_reset_id = 0;
}
@@ -823,9 +823,9 @@
G_OBJECT_CLASS (gdm_simple_slave_parent_class)->finalize (object);
}
-diff -Nur gdm-2.23.2-orig/daemon/simple-slave-main.c gdm-2.23.2/daemon/simple-slave-main.c
---- gdm-2.23.2-orig/daemon/simple-slave-main.c 2008-08-12 11:14:49.353575000 +0800
-+++ gdm-2.23.2/daemon/simple-slave-main.c 2008-08-12 12:36:40.693325000 +0800
+diff -Nur gdm-2.23.92/daemon/simple-slave-main.c gdm-2.23.92-new/daemon/simple-slave-main.c
+--- gdm-2.23.92/daemon/simple-slave-main.c 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/daemon/simple-slave-main.c 2008-09-18 10:42:55.138897000 +0800
@@ -170,6 +170,7 @@
DBusGConnection *connection;
GdmSlave *slave;
@@ -834,7 +834,7 @@
static gboolean debug = FALSE;
GdmSignalHandler *signal_handler;
static GOptionEntry entries [] = {
-@@ -233,6 +234,11 @@
+@@ -235,6 +236,11 @@
if (slave == NULL) {
goto out;
}
@@ -846,9 +846,9 @@
g_signal_connect (slave,
"stopped",
G_CALLBACK (on_slave_stopped),
-diff -Nur gdm-2.23.2-orig/utils/Makefile.am gdm-2.23.2/utils/Makefile.am
---- gdm-2.23.2-orig/utils/Makefile.am 2008-08-12 11:14:48.938546000 +0800
-+++ gdm-2.23.2/utils/Makefile.am 2008-08-12 12:38:21.327842000 +0800
+diff -Nur gdm-2.23.92/utils/Makefile.am gdm-2.23.92-new/utils/Makefile.am
+--- gdm-2.23.92/utils/Makefile.am 2008-08-27 03:04:00.000000000 +0800
++++ gdm-2.23.92-new/utils/Makefile.am 2008-09-18 10:42:55.139135000 +0800
@@ -3,6 +3,7 @@
INCLUDES = \
-I. \
@@ -882,9 +882,9 @@
EXTRA_DIST = \
gdm-stop.in \
gdm-restart.in \
-diff -Nur gdm-2.23.2-orig/utils/gdmdynamic.c gdm-2.23.2/utils/gdmdynamic.c
---- gdm-2.23.2-orig/utils/gdmdynamic.c 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.23.2/utils/gdmdynamic.c 2008-08-12 11:17:04.455403000 +0800
+diff -Nur gdm-2.23.92/utils/gdmdynamic.c gdm-2.23.92-new/utils/gdmdynamic.c
+--- gdm-2.23.92/utils/gdmdynamic.c 1970-01-01 08:00:00.000000000 +0800
++++ gdm-2.23.92-new/utils/gdmdynamic.c 2008-09-18 10:42:55.139508000 +0800
@@ -0,0 +1,277 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dau...@us...> - 2008-09-17 11:13:39
|
Revision: 1386
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1386&view=rev
Author: dauphing
Date: 2008-09-17 11:13:50 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
no root package
Modified Paths:
--------------
spec-files-extra/trunk/SFEcairo-dock.spec
Modified: spec-files-extra/trunk/SFEcairo-dock.spec
===================================================================
--- spec-files-extra/trunk/SFEcairo-dock.spec 2008-09-17 08:51:44 UTC (rev 1385)
+++ spec-files-extra/trunk/SFEcairo-dock.spec 2008-09-17 11:13:50 UTC (rev 1386)
@@ -25,7 +25,7 @@
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-Requires: %name-root
+#Requires: %name-root
Requires: SUNWpng
Requires: SUNWdbus
Requires: SUNWgnome-base-libs
@@ -34,12 +34,13 @@
BuildRequires: SUNWdbus-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-wm-devel
-BuildRequires: SFEsed
+BuildRequires: SUNWcompiz
+# TODO require at least a 3D desktop
-%package root
-Summary: %summary - platform dependent files, / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
+#%package root
+#Summary: %summary - platform dependent files, / filesystem
+#SUNW_BaseDir: /
+#%include default-depend.inc
%package devel
Summary: %summary - developer files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dau...@us...> - 2008-09-17 08:51:34
|
Revision: 1385
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1385&view=rev
Author: dauphing
Date: 2008-09-17 08:51:44 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Blender-root does not exist
Modified Paths:
--------------
spec-files-extra/trunk/SFEblender.spec
Modified: spec-files-extra/trunk/SFEblender.spec
===================================================================
--- spec-files-extra/trunk/SFEblender.spec 2008-09-17 06:15:19 UTC (rev 1384)
+++ spec-files-extra/trunk/SFEblender.spec 2008-09-17 08:51:44 UTC (rev 1385)
@@ -15,7 +15,7 @@
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-Requires: %name-root
+#Requires: %name-root
Requires: SUNWlibsdl
Requires: SUNWxorg-mesa
Requires: SUNWfreetype2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2008-09-17 06:15:11
|
Revision: 1384
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1384&view=rev
Author: yippi
Date: 2008-09-17 06:15:19 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
2008-09-17 Brian Cameron <bri...@su...>
* SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
Bump to 0.5.10.
* SFEpigment.spec, patch/pigment-01-m4.diff: Bump to 0.3.9. Remove
upstream patch.
* SFEpigment-python.spec: Bump to 0.3.7.
* SUNWgnome-display-mgr, patches/gdm-05-crash.diff: Bump to 2.23.92
and rework patch.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SFEelisa-plugins-bad.spec
spec-files-extra/trunk/SFEelisa-plugins-good.spec
spec-files-extra/trunk/SFEelisa.spec
spec-files-extra/trunk/SFEpigment-python.spec
spec-files-extra/trunk/SFEpigment.spec
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
spec-files-extra/trunk/patches/gdm-05-crash.diff
Removed Paths:
-------------
spec-files-extra/trunk/patches/pigment-01-m4.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/ChangeLog 2008-09-17 06:15:19 UTC (rev 1384)
@@ -1,3 +1,13 @@
+2008-09-17 Brian Cameron <bri...@su...>
+
+ * SFEelisa.spec, SFEelisa-plugins-good.spec, SFEelisa-plugins-bad.spec:
+ Bump to 0.5.10.
+ * SFEpigment.spec, patch/pigment-01-m4.diff: Bump to 0.3.9. Remove
+ upstream patch.
+ * SFEpigment-python.spec: Bump to 0.3.7.
+ * SUNWgnome-display-mgr, patches/gdm-05-crash.diff: Bump to 2.23.92
+ and rework patch.
+
2008-09-16 Gilles Dauphin <da...@en...>
* Initial Blender Package 2.47
Modified: spec-files-extra/trunk/SFEelisa-plugins-bad.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SFEelisa-plugins-bad.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-bad
-%define version 0.5.8
+%define version 0.5.10
%include Solaris.inc
@@ -79,6 +79,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Wed Sep 17 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.8.
* Mon Aug 18 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa-plugins-good.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SFEelisa-plugins-good.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -6,7 +6,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa-plugins-good
-%define version 0.5.8
+%define version 0.5.10
%include Solaris.inc
@@ -74,6 +74,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Wed Sep 17 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...>
- Bump to 0.5.8.
* Mon Aug 18 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEelisa.spec
===================================================================
--- spec-files-extra/trunk/SFEelisa.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SFEelisa.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -11,7 +11,7 @@
# bugdb: https://bugs.launchpad.net/elisa
#
%define name elisa
-%define version 0.5.8
+%define version 0.5.10
%include Solaris.inc
@@ -116,6 +116,8 @@
%{_libdir}/python%{pythonver}/vendor-packages/elisa_generic_setup.pyc
%changelog
+* Wed Sep 17 2008 Brian Cameron <bri...@su...>
+- Bump to 0.5.10.
* Sun Sep 07 2008 Brian Cameron <bri...@su...
- Bump to 0.5.8.
* Mon Aug 18 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEpigment-python.spec
===================================================================
--- spec-files-extra/trunk/SFEpigment-python.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SFEpigment-python.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -4,7 +4,7 @@
# includes module(s): pigment-python
#
%define name pigment-python
-%define version 0.3.6
+%define version 0.3.7
%define pythonver 2.4
%include Solaris.inc
@@ -85,6 +85,8 @@
%{_datadir}/pigment-python
%changelog
+* Wed Sep 17 2008 Brian Cameron <bri...@su...>
+- Bump to 0.3.7.
* Thu Sep 11 2008 Jerry Yu <jij...@su...>
- Bump to 0.3.6.
* Thu Jul 31 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SFEpigment.spec
===================================================================
--- spec-files-extra/trunk/SFEpigment.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SFEpigment.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -4,7 +4,7 @@
# includes module(s): pigment
#
%define name pigment
-%define version 0.3.8
+%define version 0.3.9
%include Solaris.inc
@@ -13,7 +13,6 @@
Version: %{version}
URL: https://core.fluendo.com/pigment/trac
Source0: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.bz2
-Patch1: pigment-01-m4.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SUNWgnome-common-devel
@@ -44,7 +43,6 @@
%prep
%setup -q -n pigment-%version
-%patch1 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -96,9 +94,11 @@
%{_datadir}/gtk-doc/html/*
%changelog
-* Thu Sept 10 2008 Jerry Yu <jij...@su...>
+* Wed Sep 17 2008 Brian Cameron <bri...@su...>
+- Bump to 0.3.9. Remove upstream patch pigment-01-m4.diff.
+* Thu Sep 10 2008 Jerry Yu <jij...@su...>
- Bump to 0.3.8.
-- Add patch -01-m4.diff.
+- Add patch pigment-01-m4.diff.
* Thu Jul 31 2008 Brian Cameron <bri...@su...>
- Bump to 0.3.7.
* Wed Jul 23 2008 Brian Cameron <bri...@su...>
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-17 06:15:19 UTC (rev 1384)
@@ -13,7 +13,7 @@
Summary: GNOME display manager
Name: SUNWgnome-display-mgr
-Version: 2.23.90
+Version: 2.23.92
Release: 1
Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.23/gdm-%{version}.tar.bz2
Source1: gdm.xml
@@ -89,8 +89,8 @@
%patch1 -p1
%patch2 -p0
%patch3 -p1
-%patch4 -p1
-%patch5 -p0
+#%patch4 -p1
+%patch5 -p1
%build
export LDFLAGS="%_ldflags -L/usr/openwin/lib -lXau -R/usr/openwin/lib -R/usr/sfw/lib"
@@ -258,7 +258,8 @@
%{_libexecdir}/gdm*
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/gdm
-#%{_datadir}/gnome/help/gdm/C
+%dir %attr (0755, root, other) %{_datadir}/gnome
+%{_datadir}/gnome/help/gdm/C
%attr (-, root, other) %{_datadir}/icons
#%{_datadir}/omf/gdm/*-C.omf
%dir %attr (0755, root, other) %{_datadir}/pixmaps
@@ -305,6 +306,8 @@
%endif
%changelog
+* Wed Sep 17 2008 - bri...@su...
+- Bump to 2.23.92.
* Fri Sep 05 2008 - sim...@su...
- Add patch 05-crash.diff.
* Tue Aug 26 2008 - bri...@su...
Modified: spec-files-extra/trunk/patches/gdm-05-crash.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-05-crash.diff 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/patches/gdm-05-crash.diff 2008-09-17 06:15:19 UTC (rev 1384)
@@ -1,22 +1,12 @@
---- gui/simple-greeter/gdm-chooser-widget.c.orig 2008-09-05 14:27:00.046531000 +0800
-+++ gui/simple-greeter/gdm-chooser-widget.c 2008-09-05 14:12:01.315575000 +0800
-@@ -1013,7 +1013,7 @@
- {
- g_return_if_fail (GDM_IS_CHOOSER_WIDGET (widget));
-
-- g_debug ("GdmChooserWidget: setting active item '%s'", id);
-+ g_debug ("GdmChooserWidget: setting active item '%s'", id?id:"NULL");
-
- if (id != NULL) {
- activate_from_item_id (widget, id);
---- data/Xsession.solaris.orig 2008-09-05 17:41:15.405071000 +0800
-+++ data/Xsession.solaris 2008-09-05 17:41:30.316444000 +0800
-@@ -20,7 +20,7 @@
+--- gdm-2.23.92/data/Xsession.solaris-orig 2008-09-17 01:01:33.158880000 -0500
++++ gdm-2.23.92/data/Xsession.solaris 2008-09-17 01:01:43.565237000 -0500
+@@ -20,7 +20,8 @@ export G_BROKEN_FILENAMES
# G_FILENAME_ENCODING=@locale
# export G_FILENAME_ENCODING
-export VTE_CJK_WIDTH=1
-+# export VTE_CJK_WIDTH=1
++VTE_CJK_WIDTH=1
++export VTE_CJK_WIDTH
if [ "x$LANG" = "xzh" ] ; then
export LANGUAGE=zh:zh_CN.EUC
Deleted: spec-files-extra/trunk/patches/pigment-01-m4.diff
===================================================================
--- spec-files-extra/trunk/patches/pigment-01-m4.diff 2008-09-16 20:35:25 UTC (rev 1383)
+++ spec-files-extra/trunk/patches/pigment-01-m4.diff 2008-09-17 06:15:19 UTC (rev 1384)
@@ -1,24 +0,0 @@
---- pigment-0.3.8/common/m4/as-version.m4.orig 2008-09-11 14:04:49.057414000 +0800
-+++ pigment-0.3.8/common/m4/as-version.m4 2008-09-11 14:05:51.088842000 +0800
-@@ -23,9 +23,9 @@
-
- AC_DEFUN([AS_VERSION],
- [
-- PACKAGE_VERSION_MAJOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f1)
-- PACKAGE_VERSION_MINOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f2)
-- PACKAGE_VERSION_MICRO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f3)
-+ PACKAGE_VERSION_MAJOR=`echo AC_PACKAGE_VERSION | cut -d'.' -f1`
-+ PACKAGE_VERSION_MINOR=`echo AC_PACKAGE_VERSION | cut -d'.' -f2`
-+ PACKAGE_VERSION_MICRO=`echo AC_PACKAGE_VERSION | cut -d'.' -f3`
-
- AC_SUBST(PACKAGE_VERSION_MAJOR)
- AC_SUBST(PACKAGE_VERSION_MINOR)
-@@ -53,7 +53,7 @@
- [
- AC_MSG_CHECKING(nano version)
-
-- NANO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f4)
-+ NANO=`echo AC_PACKAGE_VERSION | cut -d'.' -f4`
-
- if test x"$NANO" = x || test "x$NANO" = "x0" ; then
- AC_MSG_RESULT([0 (release)])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dau...@us...> - 2008-09-16 20:35:14
|
Revision: 1383
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1383&view=rev
Author: dauphing
Date: 2008-09-16 20:35:25 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
it works
Modified Paths:
--------------
spec-files-extra/trunk/SFEblender.spec
spec-files-extra/trunk/ext-sources/blender-01.sh
Modified: spec-files-extra/trunk/SFEblender.spec
===================================================================
--- spec-files-extra/trunk/SFEblender.spec 2008-09-16 17:11:36 UTC (rev 1382)
+++ spec-files-extra/trunk/SFEblender.spec 2008-09-16 20:35:25 UTC (rev 1383)
@@ -113,7 +113,7 @@
gmake release
cd obj/blender-2.47.0-solaris-2.11-x86_64-py2.4
mkdir -p $RPM_BUILD_ROOT%{_datadir}/blender
-chown root:bin $RPM_BUILD_ROOT%{_datadir}/blender
+#chown root:bin $RPM_BUILD_ROOT%{_datadir}/blender
for f in blender.html BlenderQuickStart.pdf copyright.txt GPL-license.txt Python-license.txt release_247.txt ; do
install -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/blender
@@ -127,13 +127,14 @@
cd ..
cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/blender
-chown root:bin $RPM_BUILD_ROOT%{_bindir}/blender
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/blender
+#chown root:bin $RPM_BUILD_ROOT%{_bindir}/blender
-%if %build_l10n
-%else
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-%endif
+#%if %build_l10n
+#%else
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+#%endif
%clean
@@ -142,26 +143,22 @@
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
+%{_bindir}/blender.exe
+%attr(0755, root, bin) %{_bindir}/blender
%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, other) %{_datadir}/blender
-%dir %attr(0755, root, other) %{_datadir}/blender/locale
-%dir %attr(0755, root, other) %{_datadir}/blender/scripts
-%dir %attr(0755, root, other) %{_datadir}/blender/scripts/bpydata
+%dir %attr(0755, root, bin) %{_datadir}/blender
%{_datadir}/blender/*
-%{_datadir}/blender/*/*
-%{_datadir}/blender/*/*/*
+%{_datadir}/blender/.Blanguages
+%{_datadir}/blender/.bfont.ttf
+#%if %build_l10n
+#%files l10n
+#%defattr (-, root, bin)
+#%dir %attr (0755, root, sys) %{_datadir}
+#%attr (-, root, other) %{_datadir}/locale
+#%endif
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
-%endif
-
%changelog
* Sept 16 2008 - Gilles Dauphin ( Gilles DOT Dauphin AT enst DOT fr)
- Initial spec
Modified: spec-files-extra/trunk/ext-sources/blender-01.sh
===================================================================
--- spec-files-extra/trunk/ext-sources/blender-01.sh 2008-09-16 17:11:36 UTC (rev 1382)
+++ spec-files-extra/trunk/ext-sources/blender-01.sh 2008-09-16 20:35:25 UTC (rev 1383)
@@ -1,7 +1,7 @@
#!/bin/sh
# Idea from pkgsrc GD 20080916
-if ! [ -d ${HOME}/.blender ]; then
+if [ ! -d ${HOME}/.blender ]; then
echo Softlinking ${HOME}/.blender to point to global /usr/share/blender settings.
ln -s /usr/share/blender ${HOME}/.blender
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dau...@us...> - 2008-09-16 17:11:28
|
Revision: 1382
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1382&view=rev
Author: dauphing
Date: 2008-09-16 17:11:36 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Blender is here
Modified Paths:
--------------
spec-files-extra/trunk/SFEblender.spec
Modified: spec-files-extra/trunk/SFEblender.spec
===================================================================
--- spec-files-extra/trunk/SFEblender.spec 2008-09-16 16:29:07 UTC (rev 1381)
+++ spec-files-extra/trunk/SFEblender.spec 2008-09-16 17:11:36 UTC (rev 1382)
@@ -87,6 +87,26 @@
gmake
%install
+
+NAN_NO_KETSJI=true
+export NAN_NO_KETSJI
+NAN_OPENEXR=/usr
+export NAN_OPENEXR
+NAN_PYTHON_VERSION=2.4
+export NAN_PYTHON_VERSION
+NAN_PYTHON=/usr
+export NAN_PYTHON
+NAN_SDL=/usr
+export NAN_SDL
+NAN_JPEG=/usr
+export NAN_JPEG
+NAN_PNG=/usr
+export NAN_PNG
+NAN_ZLIB=/usr
+export NAN_ZLIB
+NOPLUGINS=true
+export NOPLUGINS
+
rm -rf $RPM_BUILD_ROOT
#mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
cd blender-%{version}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|