fortunes-pl: pld Do odwaznych swiat nalezy.
Author: pawelz Date: Thu Jun 2 22:31:17 2011 GMT Module: fortunes-pl Tag: HEAD Log message: Do odwaznych swiat nalezy. Files affected: fortunes-pl: pld (1.449 - 1.450) Diffs: Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.449 fortunes-pl/pld:1.450 --- fortunes-pl/pld:1.449 Fri Nov 19 21:28:30 2010 +++ fortunes-pl/pld Fri Jun 3 00:31:12 2011 @@ -1,4 +1,17 @@ #pld +21:10:20 ::: Mif_ dołączył do #pld +21:10:26 Mif_ dzień dobry +21:11:19 Mif_ mam tylko jedno krótkie pytanie :) - czy jest sens, żebym instalował tą dystrybucję, jeśli nie mam linuksa w małym palcu, a tylko znudził mi się Debian? :P +21:11:58 fi9o Mif_: Przekonaj sie. +21:12:03 +arekm Mif_: jeśli lubisz dłubać to tak +21:12:39 Mif_ ok, dzięki - to mnie zachęciło +21:12:43 Mif_ na razie : +21:12:46 ::: Mif_ opuścił #pld (no reason) +22:48:39 pawelz Biedny Mif_... ;-) +23:06:17 fi9o pawelz: Ponoc do odwaznych swiat nalezy +23:09:22 +wolf^ sam sobie winien, wpadl na 2 minuty, uwierzyl pierwszej osobie, nie dal szansy zeby go ktos ostrzegl, ze to szambo : +% +#pld 23:23 @uzsolt pawelz: arekm needed the stable texlive2009 so this is the reason of integer release ;) % #pld CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/fortunes-pl/pld?r1=1.449r2=1.450f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: saxon/saxon.sh - no need to exec jpackage-util's 'run'
Author: pawelz Date: Wed Apr 20 20:26:37 2011 GMT
Module: packages Tag: HEAD
Log message:
- no need to exec jpackage-util's 'run'
Files affected:
packages/saxon:
saxon.sh (1.2 - 1.3)
Diffs:
Index: packages/saxon/saxon.sh
diff -u packages/saxon/saxon.sh:1.2 packages/saxon/saxon.sh:1.3
--- packages/saxon/saxon.sh:1.2 Wed Apr 20 21:37:20 2011
+++ packages/saxon/saxon.sh Wed Apr 20 22:26:32 2011
@@ -6,4 +6,4 @@
CLASSPATH=$(find-jar saxon)
MAIN_CLASS=com.icl.saxon.StyleSheet
-exec run ${1:+$@}
+run ${1:+$@}
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/saxon/saxon.sh?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: saxon/saxon.sh - reverted, exec inside run was introduced in rece...
Author: pawelz Date: Wed Apr 20 20:36:33 2011 GMT
Module: packages Tag: HEAD
Log message:
- reverted, exec inside run was introduced in recent version of jpackage-utils
(pointed out by glen)
Files affected:
packages/saxon:
saxon.sh (1.3 - 1.4)
Diffs:
Index: packages/saxon/saxon.sh
diff -u packages/saxon/saxon.sh:1.3 packages/saxon/saxon.sh:1.4
--- packages/saxon/saxon.sh:1.3 Wed Apr 20 22:26:32 2011
+++ packages/saxon/saxon.sh Wed Apr 20 22:36:28 2011
@@ -6,4 +6,6 @@
CLASSPATH=$(find-jar saxon)
MAIN_CLASS=com.icl.saxon.StyleSheet
-run ${1:+$@}
+# Note: there is 'exec' inside run in new jpackage-utils (1.7.5), however there
+# is no exec in older one (1.7.3), so do not remove exec here.
+exec run ${1:+$@}
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/saxon/saxon.sh?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-antlr3/java-antlr3.spec
Author: pawelz Date: Wed Apr 20 20:47:02 2011 GMT
Module: packages Tag: HEAD
Log message:
Files affected:
packages/java-antlr3:
java-antlr3.spec (1.7 - 1.8)
Diffs:
Index: packages/java-antlr3/java-antlr3.spec
diff -u packages/java-antlr3/java-antlr3.spec:1.7
packages/java-antlr3/java-antlr3.spec:1.8
--- packages/java-antlr3/java-antlr3.spec:1.7 Sun Apr 18 14:49:16 2010
+++ packages/java-antlr3/java-antlr3.spec Wed Apr 20 22:46:57 2011
@@ -11,11 +11,11 @@
%include /usr/lib/rpm/macros.java
-%include /usr/lib/rpm/macros.java
+%definesrcname antlr3
Summary: ANother Tool for Language Recognition
Name: java-antlr3
Version: 3.2
-Release: 2
+Release: 3
License: Public Domain
Group: Development/Languages/Java
Source0: http://antlr.org/download/antlr-%{version}.jar
@@ -78,8 +78,8 @@
install -d $RPM_BUILD_ROOT%{_javadir}/ant
# jars
-cp -a %{SOURCE0} $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -a %{SOURCE0} $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
%if %{with ant}
cp -a ant-antlr3.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-antlr3.jar
@@ -104,6 +104,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.8 2011/04/20 20:46:57 pawelz
+*** empty log message ***
+
Revision 1.7 2010/04/18 12:49:16 jajcus
- Obsoletes: antlr3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-antlr3/java-antlr3.spec?r1=1.7r2=1.8f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-antlr3/java-antlr3.spec - Accidentally I commited without th...
Author: pawelz Date: Wed Apr 20 20:48:10 2011 GMT Module: packages Tag: HEAD Log message: - Accidentally I commited without the previous commit without a log: - fixed names of jar files (broken exactly one year ago!) - I wonder how many other packages have I just broken. - rel 3 Files affected: packages/java-antlr3: java-antlr3.spec (1.8 - 1.9) Diffs: Index: packages/java-antlr3/java-antlr3.spec diff -u packages/java-antlr3/java-antlr3.spec:1.8 packages/java-antlr3/java-antlr3.spec:1.9 --- packages/java-antlr3/java-antlr3.spec:1.8 Wed Apr 20 22:46:57 2011 +++ packages/java-antlr3/java-antlr3.spec Wed Apr 20 22:48:05 2011 @@ -104,6 +104,12 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.9 2011/04/20 20:48:05 pawelz +- Accidentally I commited without the previous commit without a log: +- fixed names of jar files (broken exactly one year ago!) +- I wonder how many other packages have I just broken. +- rel 3 + Revision 1.8 2011/04/20 20:46:57 pawelz *** empty log message *** CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-antlr3/java-antlr3.spec?r1=1.8r2=1.9f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-antlr3/java-antlr3.spec - fixed changelog
Author: pawelz Date: Wed Apr 20 20:51:11 2011 GMT Module: packages Tag: HEAD Log message: - fixed changelog Files affected: packages/java-antlr3: java-antlr3.spec (1.9 - 1.10) Diffs: Index: packages/java-antlr3/java-antlr3.spec diff -u packages/java-antlr3/java-antlr3.spec:1.9 packages/java-antlr3/java-antlr3.spec:1.10 --- packages/java-antlr3/java-antlr3.spec:1.9 Wed Apr 20 22:48:05 2011 +++ packages/java-antlr3/java-antlr3.spec Wed Apr 20 22:51:06 2011 @@ -104,6 +104,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.10 2011/04/20 20:51:06 pawelz +- fixed changelog + Revision 1.9 2011/04/20 20:48:05 pawelz - Accidentally I commited without the previous commit without a log: - fixed names of jar files (broken exactly one year ago!) @@ -111,7 +114,7 @@ - rel 3 Revision 1.8 2011/04/20 20:46:57 pawelz -*** empty log message *** +- Revision 1.7 2010/04/18 12:49:16 jajcus - Obsoletes: antlr3 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-antlr3/java-antlr3.spec?r1=1.9r2=1.10f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: stanse/stanse.sh, stanse/stanse.spec - use jpackage-utils in shel...
Author: pawelz Date: Wed Apr 20 20:56:25 2011 GMT
Module: packages Tag: HEAD
Log message:
- use jpackage-utils in shell wrapper
- rel 0.2
Files affected:
packages/stanse:
stanse.sh (1.6 - 1.7) , stanse.spec (1.6 - 1.7)
Diffs:
Index: packages/stanse/stanse.sh
diff -u packages/stanse/stanse.sh:1.6 packages/stanse/stanse.sh:1.7
--- packages/stanse/stanse.sh:1.6 Wed Oct 14 14:38:09 2009
+++ packages/stanse/stanse.sh Wed Apr 20 22:56:19 2011
@@ -1,8 +1,11 @@
#!/bin/sh -e
+
+[ -r /usr/share/java-utils/java-functions ]
+. /usr/share/java-utils/java-functions
+
# Set paths
CLASSPATH=$(build-classpath-directory /usr/share/stanse/lib)
CLASSPATH=$CLASSPATH:$(find-jar stanse)
-export CLASSPATH
export PATH=$PATH:/usr/share/stanse/data/bin
@@ -13,4 +16,6 @@
[ -e $STANSE_HOME/data ] || cp -a /usr/share/stanse/data $STANSE_HOME/data
[ -e $STANSE_HOME/properties.xml ] || cp -a /usr/share/stanse/properties.xml
$STANSE_HOME/properties.xml
-exec java cz.muni.stanse.Stanse $@
+MAIN_CLASS=cz.muni.stanse.Stanse
+
+exec run ${1:+$@}
Index: packages/stanse/stanse.spec
diff -u packages/stanse/stanse.spec:1.6 packages/stanse/stanse.spec:1.7
--- packages/stanse/stanse.spec:1.6 Sat Apr 17 09:44:36 2010
+++ packages/stanse/stanse.spec Wed Apr 20 22:56:19 2011
@@ -9,7 +9,7 @@
Summary(pl.UTF-8): Narzędzie do znajdowania błędów na podstawie statycznej
analizy kodu.
Name: stanse
Version: 1.0.0
-Release: 0.1
+Release: 0.2
License: GPL v2
Group: Development/Languages/Java
Source0: http://stanse.fi.muni.cz/download/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@
BuildRequires: rpmbuild(macros) = 1.300
BuildConflicts:java-gcj-compat
Requires: gcc
+Requires: jpackage-utils
Requires: make
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -159,6 +160,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.7 2011/04/20 20:56:19 pawelz
+- use jpackage-utils in shell wrapper
+- rel 0.2
+
Revision 1.6 2010/04/17 07:44:36 jajcus
- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stanse/stanse.sh?r1=1.6r2=1.7f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stanse/stanse.spec?r1=1.6r2=1.7f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: openttd/openttd.spec - rel 2
Author: pawelz Date: Tue Apr 5 21:39:40 2011 GMT
Module: packages Tag: HEAD
Log message:
- rel 2
Files affected:
packages/openttd:
openttd.spec (1.93 - 1.94)
Diffs:
Index: packages/openttd/openttd.spec
diff -u packages/openttd/openttd.spec:1.93 packages/openttd/openttd.spec:1.94
--- packages/openttd/openttd.spec:1.93 Tue Apr 5 09:00:32 2011
+++ packages/openttd/openttd.spec Tue Apr 5 23:39:35 2011
@@ -7,7 +7,7 @@
Summary(pl.UTF-8): Otwarta reimplementacja gry Transport Tycoon Deluxe
Name: openttd
Version: 1.1.0
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications/Games
Source0:
http://binaries.openttd.org/releases/%{version}/%{name}-%{version}-source.tar.xz
@@ -201,6 +201,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.94 2011/04/05 21:39:35 pawelz
+- rel 2
+
Revision 1.93 2011/04/05 07:00:32 lisu
- merged commit logs from DEVEL
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openttd/openttd.spec?r1=1.93r2=1.94f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - up to 20110312
Author: pawelz Date: Sat Mar 12 18:54:47 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 20110312
Files affected:
packages/ekg2:
ekg2.spec (1.145 - 1.146)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.145 packages/ekg2/ekg2.spec:1.146
--- packages/ekg2/ekg2.spec:1.145 Sun Mar 6 03:13:36 2011
+++ packages/ekg2/ekg2.spec Sat Mar 12 19:54:42 2011
@@ -25,7 +25,7 @@
%if %{with git}
%definesubver git.%(date +%Y%m%d)
%else
-%definesubver 20110305
+%definesubver 20110312
%endif
%definerel 1
@@ -44,7 +44,7 @@
Group: Applications/Communications
%if %{without git}
Source0:
https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
-# Source0-md5: 31031944a74fd569fbf275111c62a9bc
+# Source0-md5: a6abd350258279f5c692a27746e60a28
%endif
Patch0:%{name}-perl-install.patch
Patch1:%{name}-gtk.patch
@@ -555,6 +555,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.146 2011/03/12 18:54:42 pawelz
+- up to 20110312
+
Revision 1.145 2011/03/06 02:13:36 pawelz
- up to 20110305
- dropped some plugins that does not build
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.145r2=1.146f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20110312.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 1 STORED: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20110312.tar.bz2 a6abd350258279f5c692a27746e60a28 ekg2-20110312.tar.bz2 Size: 1171751 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: linphone/linphone.spec - up to 3.4.2
Author: pawelz Date: Sat Mar 5 16:55:13 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 3.4.2
Files affected:
packages/linphone:
linphone.spec (1.50 - 1.51)
Diffs:
Index: packages/linphone/linphone.spec
diff -u packages/linphone/linphone.spec:1.50
packages/linphone/linphone.spec:1.51
--- packages/linphone/linphone.spec:1.50Fri Jun 4 23:19:35 2010
+++ packages/linphone/linphone.spec Sat Mar 5 17:55:08 2011
@@ -8,12 +8,12 @@
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
-Version: 3.3.1
+Version: 3.4.2
Release: 0.1
License: LGPL/GPL
Group: Applications/Communications
Source0:
http://download.savannah.gnu.org/releases/linphone/stable/sources//%{name}-%{version}.tar.gz
-# Source0-md5: bf17ae27e89c5ed1aa17f2a0a83a3870
+# Source0-md5: aaa5bb7c60d7cab2b1a63a1a42535d38
URL: http://www.linphone.org/
BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel = 0.9.0
@@ -191,6 +191,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.51 2011/03/05 16:55:08 pawelz
+- up to 3.4.2
+
Revision 1.50 2010/06/04 21:19:35 arvenil
- up to 3.3.1
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.50r2=1.51f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: linphone: linphone-3.4.2.tar.gz
Files fetched: 1 STORED: http://download.savannah.gnu.org/releases/linphone/stable/sources//linphone-3.4.2.tar.gz aaa5bb7c60d7cab2b1a63a1a42535d38 linphone-3.4.2.tar.gz Size: 8158296 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: linphone/linphone.spec - do not install ortp
Author: pawelz Date: Sat Mar 5 19:52:52 2011 GMT
Module: packages Tag: HEAD
Log message:
- do not install ortp
Files affected:
packages/linphone:
linphone.spec (1.52 - 1.53)
Diffs:
Index: packages/linphone/linphone.spec
diff -u packages/linphone/linphone.spec:1.52
packages/linphone/linphone.spec:1.53
--- packages/linphone/linphone.spec:1.52Sat Mar 5 18:16:47 2011
+++ packages/linphone/linphone.spec Sat Mar 5 20:52:47 2011
@@ -4,7 +4,6 @@
#auto-answering machine and linphone applet for gnome)
# - check if all this configure option I've set are really needed
# - separate libraries that do not require gnome into subpackages for Jingle
support in kopete
-# - separate ortp (is newer than current ortp.spec)
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
@@ -158,8 +157,8 @@
%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.?
%attr(755,root,root) %{_libdir}/libmediastreamer.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmediastreamer.so.?
-%attr(755,root,root) %{_libdir}/libortp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libortp.so.?
+# %attr(755,root,root) %{_libdir}/libortp.so.*.*.*
+# %attr(755,root,root) %ghost %{_libdir}/libortp.so.?
%{_libdir}/mediastream
%{_datadir}/sounds/*
%{_desktopdir}/*.desktop
@@ -194,6 +193,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.53 2011/03/05 19:52:47 pawelz
+- do not install ortp
+
Revision 1.52 2011/03/05 17:16:47 sparky
- link with -lXext to fix linking
- BR: gtk+2-devel, intltool, libv4l-devel, ncurses-devel, pulseaudio-devel,
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.52r2=1.53f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: linphone/linphone.spec - reverted last commit. It does not work w...
Author: pawelz Date: Sat Mar 5 20:02:54 2011 GMT
Module: packages Tag: HEAD
Log message:
- reverted last commit. It does not work with our ortp. Unfortunately it means,
it conflicts with ortp.
- rel 0.3
Files affected:
packages/linphone:
linphone.spec (1.53 - 1.54)
Diffs:
Index: packages/linphone/linphone.spec
diff -u packages/linphone/linphone.spec:1.53
packages/linphone/linphone.spec:1.54
--- packages/linphone/linphone.spec:1.53Sat Mar 5 20:52:47 2011
+++ packages/linphone/linphone.spec Sat Mar 5 21:02:46 2011
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
Version: 3.4.2
-Release: 0.1
+Release: 0.3
License: LGPL/GPL
Group: Applications/Communications
Source0:
http://download.savannah.gnu.org/releases/linphone/stable/sources//%{name}-%{version}.tar.gz
@@ -40,7 +40,7 @@
BuildRequires: xorg-lib-libXv-devel
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): /usr/bin/scrollkeeper-update
-Provides: ortp = 0.14.2
+Provides: ortp = 0.16
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -84,7 +84,7 @@
Requires: libsamplerate-devel = 0.0.13
Requires: lpc10-devel = 1.5
Requires: speex-devel = 1.0.0
-Provides: ortp-devel = 0.14.2
+Provides: ortp-devel = 0.16
%description devel
Development files for the Linphone Internet Phone.
@@ -97,7 +97,7 @@
Summary(pl.UTF-8): Statyczne biblioteki Linphone
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-Provides: ortp-static = 0.14.2
+Provides: ortp-static = 0.16
%description static
Static version of Linphone libraries.
@@ -157,8 +157,8 @@
%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.?
%attr(755,root,root) %{_libdir}/libmediastreamer.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmediastreamer.so.?
-# %attr(755,root,root) %{_libdir}/libortp.so.*.*.*
-# %attr(755,root,root) %ghost %{_libdir}/libortp.so.?
+%attr(755,root,root) %{_libdir}/libortp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libortp.so.?
%{_libdir}/mediastream
%{_datadir}/sounds/*
%{_desktopdir}/*.desktop
@@ -193,6 +193,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.54 2011/03/05 20:02:46 pawelz
+- reverted last commit. It does not work with our ortp. Unfortunately it means,
+ it conflicts with ortp.
+- rel 0.3
+
Revision 1.53 2011/03/05 19:52:47 pawelz
- do not install ortp
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.53r2=1.54f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - up to 20110305 - dropped some plugins that does ...
Author: pawelz Date: Sun Mar 6 02:13:41 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 20110305
- dropped some plugins that does not build
- package .la files. They are required to load plugins.
Files affected:
packages/ekg2:
ekg2.spec (1.144 - 1.145)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.144 packages/ekg2/ekg2.spec:1.145
--- packages/ekg2/ekg2.spec:1.144 Sun Feb 20 22:39:19 2011
+++ packages/ekg2/ekg2.spec Sun Mar 6 03:13:36 2011
@@ -7,28 +7,28 @@
#
# Conditional build:
%bcond_without aspell # build without spell-checking support
with aspell
-%bcond_without feed# don't build feed plugin
+%bcond_without rss # don't build rss plugin
%bcond_without gadugadu# don't build gg plugin
%bcond_without gpg # don't build gpg plugin
%bcond_without gtk # don't build gtk plugin
%bcond_without jabber # don't build jabber plugin
%bcond_without gnutls # build jabber plugin without libgnutls
-%bcond_without libgsm # don't build libgsm plugin
+%bcond_withlibgsm # don't build libgsm plugin
%bcond_without perl# don't build Perl plugin
%bcond_without python # don't build Python plugin
%bcond_without readline# don't build readline interface
%bcond_withsqlite # build logsqlite plugin based on
sqlite (conflicts with sqlite3)
%bcond_without sqlite3 # don't build logsqlite plugin based on
sqlite3
-%bcond_without xosd# don't build xosd plugin
-%bcond_withgit # checkout svn trunk instead of Source0
- requested by ekg2 developer
+%bcond_withxosd# don't build xosd plugin
+%bcond_withgit # checkout git master instead of
Source0 - requested by ekg2 developer
%if %{with git}
%definesubver git.%(date +%Y%m%d)
%else
-%definesubver 20101210
+%definesubver 20110305
%endif
-%definerel 5
+%definerel 1
%if %{with sqlite}
%undefine sqlite3
@@ -44,7 +44,7 @@
Group: Applications/Communications
%if %{without git}
Source0:
https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
-# Source0-md5: 240c7203a2b8c15557710dcbc8fbf8c6
+# Source0-md5: 31031944a74fd569fbf275111c62a9bc
%endif
Patch0:%{name}-perl-install.patch
Patch1:%{name}-gtk.patch
@@ -53,7 +53,7 @@
%{?with_aspell:BuildRequires: aspell-devel}
BuildRequires: autoconf
BuildRequires: automake
-%if %{with feed} || %{with jabber}
+%if %{with rss} || %{with jabber}
BuildRequires: expat-devel
%endif
BuildRequires: gettext-devel = 0.17-8
@@ -61,7 +61,6 @@
%{?with_git:BuildRequires: git-core}
%{?with_gnutls:BuildRequires: gnutls-devel = 1.2.5}
%{?with_gpg:BuildRequires: gpgme-devel}
-BuildRequires: gpm-devel
%{?with_gtk:BuildRequires: gtk+2-devel = 2:2.14.1}
%{?with_gadugadu:BuildRequires:libgadu-devel}
%{?with_libgsm:BuildRequires: libgsm-devel}
@@ -100,17 +99,18 @@
%description devel -l pl.UTF-8
Pliki nagłówkowe ekg2.
-%package plugin-feed
-Summary: feed plugin for ekg2
-Summary(pl.UTF-8): Wtyczka feed dla ekg2
+%package plugin-rss
+Summary: rss plugin for ekg2
+Summary(pl.UTF-8): Wtyczka rss dla ekg2
Group: Applications/Communications
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: ekg2-plugin-feed
-%description plugin-feed
-feed plugin for ekg2.
+%description plugin-rss
+rss plugin for ekg2.
-%description plugin-feed -l pl.UTF-8
-Wtyczka feed dla ekg2.
+%description plugin-rss -l pl.UTF-8
+Wtyczka rss dla ekg2.
%package plugin-gpg
Summary: gpg plugin for ekg2
@@ -137,18 +137,6 @@
%description plugin-gtk -l pl.UTF-8
Wtyczka gtk dla ekg2.
-%package plugin-ioctld
-Summary: Ioctld plugin for ekg2
-Summary(pl.UTF-8): Wtyczka ioctld dla ekg2
-Group: Applications/Communications
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description plugin-ioctld
-Ioctld plugin for ekg2 (contains suid root binary!).
-
-%description plugin-ioctld -l pl.UTF-8
-Wtyczka ioctld dla ekg2 (zawiera program z ustawionym suid root!).
-
%package plugin-jogger
Summary: Jogger plugin for ekg2
Summary(pl.UTF-8): Wtyczka jogger dla ekg2
@@ -358,7 +346,6 @@
%patch1 -p1
%patch2 -p0
-sed -i -e '\#/opt/sqlite/lib#s#$# %{_libdir}#' m4/sqlite.m4
touch po/Makefile.in.in
find -name *.c po/POTFILES.in
@@ -380,7 +367,7 @@
%{!?with_gpg:--without-gpg} \
--with%{!?with_gtk:out}-gtk \
--with%{!?with_gnutls:out}-libgnutls
DISTFILES: ekg2: ERRORS: ekg2-20110305.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 1 STORED: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20110305.tar.bz2 31031944a74fd569fbf275111c62a9bc ekg2-20110305.tar.bz2 Size: 1170211 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jstun/jstun.spec, jstun/jstun.init (NEW), jstun/jstun.sh (NEW), j...
Author: pawelz Date: Fri Feb 25 22:27:51 2011 GMT
Module: packages Tag: HEAD
Log message:
- init script
- better shell wrapper
- rel 1
Files affected:
packages/jstun:
jstun.spec (1.2 - 1.3) , jstun.init (NONE - 1.1) (NEW), jstun.sh (NONE -
1.1) (NEW), jstun.sysconfig (NONE - 1.1) (NEW)
Diffs:
Index: packages/jstun/jstun.spec
diff -u packages/jstun/jstun.spec:1.2 packages/jstun/jstun.spec:1.3
--- packages/jstun/jstun.spec:1.2 Thu Feb 24 21:02:04 2011
+++ packages/jstun/jstun.spec Fri Feb 25 23:27:46 2011
@@ -1,7 +1,4 @@
# $Revision$, $Date$
-# TODO:
-# - init scripts
-#
# Conditional build:
%bcond_without source # don't build source jar
@@ -11,11 +8,14 @@
Summary(pl.UTF-8): Serwer STUN napisany w języku Java.
Name: jstun
Version: 0.7.3
-Release: 0.1
+Release: 1
License: GPL v2 or Apache v2
Group: Development/Languages/Java
Source0: http://jstun.javawi.de/%{name}-%{version}.src.tar.gz
# Source0-md5: 0e2e0c5d52ba339a33472fc3a492e96d
+Source1: %{name}.sysconfig
+Source2: %{name}.init
+Source3: %{name}.sh
URL: http://jstun.javawi.de
BuildRequires: ant
BuildRequires: jar
@@ -25,9 +25,12 @@
%if %{with source}
BuildRequires: rpmbuild(macros) = 1.555
%endif
+BuildRequires: rpmbuild(macros) = 1.228
BuildRequires: sed = 4.0
+Requires(post,preun): /sbin/chkconfig
Requires: java-slf4j
Requires: jpackage-utils
+Requires: rc-scripts
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,16 +61,6 @@
%prep
%setup -q -n STUN
-cat jstun.sh '__EOF__'
-#!/bin/sh
-
-. %{_datadir}/java-utils/java-functions
-
-CLASSPATH=$(build-classpath jstun slf4j-api slf4j-jdk14)
-MAIN_CLASS=de.javawi.jstun.test.demo.StunServer
-run ${1:+$@}
-__EOF__
-
%build
export JAVA_HOME=%{java_home}
@@ -88,6 +81,9 @@
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+
# jars
cp -a target/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -96,15 +92,31 @@
install -d $RPM_BUILD_ROOT%{_javasrcdir}
cp -a %{name}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{name}.src.jar
-install jstun.sh $RPM_BUILD_ROOT%{_sbindir}/jstun
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/jstun
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
+%preun
+if [ $1 = 0 ]; then
+ %service -q %{name} stop
+ /sbin/chkconfig --del %{name}
+fi
+
+
%files
%defattr(644,root,root,755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%attr(755,root,root) %{_sbindir}/jstun
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%if %{with source}
%files source
@@ -118,6 +130,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2011/02/25 22:27:46 pawelz
+- init script
+- better shell wrapper
+- rel 1
+
Revision 1.2 2011/02/24 20:02:04 pawelz
- shell wrapper
Index: packages/jstun/jstun.init
diff -u /dev/null packages/jstun/jstun.init:1.1
--- /dev/null Fri Feb 25 23:27:51 2011
+++ packages/jstun/jstun.init Fri Feb 25 23:27:46 2011
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# jstunJava based STUN server.
+#
+# chkconfig: 345 89 11
+#
+# description: jstun Java based STUN server.
+#
+# processname: jstun
+# config:
+# pidfile: /var/run/jstun.pid
+#
+# $Id$
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# Check that networking is up.
+if is_yes ${NETWORKING}; then
+ if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ];
then
+ msg_network_down jstun
+ exit 1
+ fi
+else
+ exit 0
+fi
+
+STUN_PORT1=3478
+STUN_PORT2=3479
+
+# Get service config - may override defaults
+[ -f /etc/sysconfig/jstun ] . /etc/sysconfig/jstun
+
+ARGS=$STUN_PORT1 $STUN_IPADDRESS1 $STUN_PORT2 $STUN_IPADDRESS2
+
+start() {
+ # Check if the service is already running?
+ if [ -f /var/lock/subsys/jstun ]; then
+ msg_already_running jstun
+ return
+ fi
+
+ msg_starting jstun
+ daemon /usr/sbin/jstun --daemon --pidfile=/var/run/jstun.pid $ARGS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] touch /var/lock/subsys/jstun
+}
+
+stop() {
+ if [ ! -f /var/lock/subsys/jstun ]; then
+ msg_not_running jstun
+ return
packages: javassist/javassist.spec up to 3.14.0
Author: pawelz Date: Thu Feb 24 18:49:49 2011 GMT
Module: packages Tag: HEAD
Log message:
up to 3.14.0
Files affected:
packages/javassist:
javassist.spec (1.7 - 1.8)
Diffs:
Index: packages/javassist/javassist.spec
diff -u packages/javassist/javassist.spec:1.7
packages/javassist/javassist.spec:1.8
--- packages/javassist/javassist.spec:1.7 Sun May 16 16:14:05 2010
+++ packages/javassist/javassist.spec Thu Feb 24 19:49:43 2011
@@ -8,12 +8,12 @@
Summary: Java Programming Assistant: bytecode manipulation
Summary(pl.UTF-8): Asystent programisty Javy: operacje na bajtkodzie
Name: javassist
-Version: 3.11.0
+Version: 3.14.0
Release: 1
License: MPL and LGPL
Group: Libraries/Java
-Source0:
http://dl.sourceforge.net/project/jboss/Javassist/3.11.0.GA/%{name}-3.11.GA.zip
-# Source0-md5: 3afecb69a0c167a978c93f7074a74dfc
+Source0: http://downloads.sourceforge.net/jboss/%{name}-%{version}-GA.zip
+# Source0-md5: a2d1b4421e3902554d333d009db852a8
URL: http://www.csg.is.titech.ac.jp/~chiba/javassist/
BuildRequires: ant = 0:1.6
BuildRequires: jdk
@@ -90,7 +90,7 @@
Podręcznik do Javassista.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-GA
find -name '*.jar' | xargs rm -vf
%build
@@ -143,6 +143,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.8 2011/02/24 18:49:43 pawelz
+up to 3.14.0
+
Revision 1.7 2010/05/16 14:14:05 sparky
- BR: unzip
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/javassist/javassist.spec?r1=1.7r2=1.8f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: javassist: javassist-3.14.0-GA.zip
Files fetched: 1 STORED: http://downloads.sourceforge.net/jboss/javassist-3.14.0-GA.zip a2d1b4421e3902554d333d009db852a8 javassist-3.14.0-GA.zip Size: 2258443 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PGP-keys: Pawel Zuzelski paw...@pld-linux.org.asc (NEW), Pawel Zuzelski ...
Author: pawelz Date: Thu Feb 24 18:56:44 2011 GMT Module: PGP-keys Tag: HEAD Log message: - New PGP key. Files affected: PGP-keys: Pawel Zuzelski paw...@pld-linux.org.asc (NONE - 1.1) (NEW), Pawel Zuzelski z...@xatka.net.asc (1.3 - NONE) (REMOVED) Diffs: Index: PGP-keys/Pawel Zuzelski paw...@pld-linux.org.asc diff -u /dev/null PGP-keys/Pawel Zuzelski paw...@pld-linux.org.asc:1.1 --- /dev/null Thu Feb 24 19:56:44 2011 +++ PGP-keys/Pawel Zuzelski paw...@pld-linux.org.asc Thu Feb 24 19:56:38 2011 @@ -0,0 +1,30 @@ +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQENBE1mqUEBCAC4ierchSXrujsJFB22DsjmSQFhXOUSvmjz0F3gXFB20KAkluPb +d3BMxVvfnrCqsZVjKbN4MUk+4Oh1cnvUldiLvQpppNMnSYc/D8JBeIMkeEw7QNm1 +wFIlHP+e1pGuLCwSqDm/JyvDqYAMHZvgiiySW3P+/RSaPzF/9IB/65cCW1uXUmJO +hBw0lO29K4Xtx7tqpB3+h/uMJcIWUElyJsM37nlmFNBPypfw1B7bMWkW5kkTDKaW +wel9SVZ/SC0ty0dPre7k/UkSXYESjp7J1GmKDfb6Ptm6u0Ck3Xlkm7wKDVWaVnpd +hEoxdzraC7NLrxa6qIjmwERCB1vqz9kHSsW/ABEBAAG0JVBhd2VsIFp1emVsc2tp +IDxwYXdlbHpAcGxkLWxpbnV4Lm9yZz6JATgEEwECACIFAk1mqUECGwMGCwkIBwMC +BhUIAgkKCwQWAgMBAh4BAheAAAoJEDI7yRdaor+rGnoIAI2pokvVYIK1bU2k0ET7 +HRjWWjsPPIyPt38Qqs99JAMmzKbCTe1N0CtzNNGUjIr2v3ij//xApc674h+EwKf7 +dYh6WIYG7/SYqhypM0NevhcuCMwcLjGHC1Zo9qahKD+wS8DFAc+GH3kxh9jRm9A+ +elOlx1VjPFER5QZ5JfPY1aa+x3Ze0gOoEltR+7pLPS2g9xalndkb6rxyxsLOlCXC +BaWkNtCcSxBoGB+jFr81Djtzg9PljFMrvjpMwOanPsjRiAQzTUphCWthAe9g34t+ +18pU2AJia4KBfoAnQmh4i2+ac+pRaHkI8K1GvpW5GT4o62trMehApK41qO1JVI5A ++gi5AQ0ETWapQQEIAK9oQAu7SePoTLiO1ITqOQtBwzPOpXaQgkK8N9aPzBUyTiE1 +XIzpuS3MAdg+7GO+KR5DDgaPXR8Cu7PsGGxxdxlJtU4Bdra14eN4sOpHtPrzmpK0 +jbJdaxV3IRQ8Jll4DfFF1X8MBa9MGIGfy++KOH8G8poP5HLmCtyxbjQIyb6QxjfG +v9PHJcsUIjmZ/6q6d/Yw6CeY8xNhOmecqZd4IHppRv5hWXHh345qx5tnpF6T7mOQ +yakh2Bdd1z9JGBUAmh+pGJpfiQUTVIPjJmf/SMlhn0i+A/EnB/sSJi8KmSr7vWs5 +iB0l1wsYe0bd4Ojya0cTizEn/Qv3ktLyzEhR4YMAEQEAAYkBHwQYAQIACQUCTWap +QQIbDAAKCRAyO8kXWqK/q65CB/4zAI9rAsB9dPDmXRS5w+B+WRrOctlH5E3FBa2u +741ZAKESCTq2USJu9j2hiYCTs+zXntALy8qzagrmlo10/R4af76qR+GiI3XrOxld +TosrTaVsz9uPlI65UlVGKvY3KCSWM3hTKCfxZPCl7wwwldz4Z9ELcT/qsEeoM2iC +NjF3VWIEDSKh6KVEEGTZ6h2p/o2GGeoGllMc0m40+2A8f4/iPniXLLJZfm4/1TUA +RldGKXlFhDkK/Jo5FDkJLLw3PV8q2AUZPW0xdzctlMaCLMmWvAst3536pu9I5ZMY +gbgQADptxHuHHLGOnVR2tQLRBpLoCLy0Iq/kYzh1M2N5mCaA +=4M8+ +-END PGP PUBLIC KEY BLOCK- ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-slf4j/java-slf4j-genbuildxml.sh (REMOVED) - No longer needed
Author: pawelz Date: Thu Feb 24 19:13:05 2011 GMT Module: packages Tag: HEAD Log message: - No longer needed Files affected: packages/java-slf4j: java-slf4j-genbuildxml.sh (1.1 - NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-slf4j/java-slf4j.spec - up to 1.6.1 - do not try to build it...
Author: pawelz Date: Thu Feb 24 19:13:33 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.6.1
- do not try to build it from source
Files affected:
packages/java-slf4j:
java-slf4j.spec (1.4 - 1.5)
Diffs:
Index: packages/java-slf4j/java-slf4j.spec
diff -u packages/java-slf4j/java-slf4j.spec:1.4
packages/java-slf4j/java-slf4j.spec:1.5
--- packages/java-slf4j/java-slf4j.spec:1.4 Fri Apr 23 02:03:41 2010
+++ packages/java-slf4j/java-slf4j.spec Thu Feb 24 20:13:28 2011
@@ -9,19 +9,13 @@
%definesrcname slf4j
Summary: Simple Logging Facade for Java
Name: java-slf4j
-Version: 1.5.8
-Release: 0.1
+Version: 1.6.1
+Release: 1
License: MIT
Group: Libraries/Java
-Source0: http://xatka.net/~z/PLD/slf4j-%{version}.tar.bz2
-# Source0-md5: 841e16c3d5d5a323ceabfc6bdce10bb8
-Source1: %{name}-genbuildxml.sh
+Source0: http://www.slf4j.org/dist/slf4j-1.6.1.tar.gz
+# Source0-md5: 289d4ce9b710269614e97f1ae6a27906
URL: http://www.slf4j.org/
-BuildRequires: java-commons-lang
-BuildRequires: java-commons-logging
-BuildRequires: java-log4j
-BuildRequires: jdk
-BuildRequires: javassist
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) = 1.300
@@ -38,37 +32,15 @@
%prep
%setup -q -n %{srcname}-%{version}
-find -name MANIFEST.MF | xargs sed -i 's,${project.version},%{version},g'
-
-# break build if any macro is left
-find -name MANIFEST.MF | ! xargs grep '\${'
-
%build
-export JAVA_HOME=%{java_home}
-
-export LC_ALL=en_US # source code not US-ASCII
-
-sh %{SOURCE1} build.xml
-
-javassist_jar=$(find-jar javassist)
-commons_logging_jar=$(find-jar commons-logging-api)
-commons_lang_jar=$(find-jar commons-lang)
-log4j_jar=$(find-jar log4j)
-
-%ant jars \
- -Djavassist-jar=$javassist_jar \
- -Dcommons-logging-jar=$commons_logging_jar \
- -Dcommons-lang-jar=$commons_lang_jar \
- -Dlog4j-jar=$log4j_jar
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
# jars
-for j in dist/*.jar; do
- n=$(basename $j .jar)
+for j in *%{version}.jar; do
+ n=$(basename $j -%{version}.jar)
cp -a $j $RPM_BUILD_ROOT%{_javadir}/$n-%{version}.jar
ln -s $n-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$n.jar
done
@@ -86,6 +58,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2011/02/24 19:13:28 pawelz
+- up to 1.6.1
+- do not try to build it from source
+
Revision 1.4 2010/04/23 00:03:41 pawelz
- Don't force specific jdk.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-slf4j/java-slf4j.spec?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: java-slf4j: slf4j-1.6.1.tar.gz
Files fetched: 1 STORED: http://www.slf4j.org/dist/slf4j-1.6.1.tar.gz 289d4ce9b710269614e97f1ae6a27906 slf4j-1.6.1.tar.gz Size: 1708903 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: jstun: jstun-0.7.3.src.tar.gz
Files fetched: 1 STORED: http://jstun.javawi.de/jstun-0.7.3.src.tar.gz 0e2e0c5d52ba339a33472fc3a492e96d jstun-0.7.3.src.tar.gz Size: 173666 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jstun/jstun.spec (NEW) - stun server, initial PLD release
Author: pawelz Date: Thu Feb 24 19:28:51 2011 GMT
Module: packages Tag: HEAD
Log message:
- stun server, initial PLD release
Files affected:
packages/jstun:
jstun.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/jstun/jstun.spec
diff -u /dev/null packages/jstun/jstun.spec:1.1
--- /dev/null Thu Feb 24 20:28:51 2011
+++ packages/jstun/jstun.spec Thu Feb 24 20:28:46 2011
@@ -0,0 +1,111 @@
+# $Revision$, $Date$
+# TODO:
+# - shell wrapper
+# - init scripts
+#
+# Conditional build:
+%bcond_without source # don't build source jar
+
+%include /usr/lib/rpm/macros.java
+
+Summary: A Java-based STUN server.
+Summary(pl.UTF-8): Serwer STUN napisany w języku Java.
+Name: jstun
+Version: 0.7.3
+Release: 0.1
+License: GPL v2 or Apache v2
+Group: Development/Languages/Java
+Source0: http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
+# Source0-md5: 0e2e0c5d52ba339a33472fc3a492e96d
+URL: http://jstun.javawi.de
+BuildRequires: ant
+BuildRequires: jar
+BuildRequires: jpackage-utils
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) = 1.300
+%if %{with source}
+BuildRequires: rpmbuild(macros) = 1.555
+%endif
+BuildRequires: sed = 4.0
+# for %{_javadir}
+Requires: jpackage-utils
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+JSTUN is a Java-based STUN (Simple Traversal of User Datagram Protocol (UDP)
+Through Network Address Translation (NAT)) implementation. STUN provides a mean
+for applications to discover the presence and type of firewalls or NATs between
+them and the public internet. Additionally, in presence of a NAT STUN can be
+used by applications to learn the public Internet Protocol (IP) address
+assigned to the NAT.
+
+So far, most of the message headers and attributes as standardized in RFC 3489
+are part of JSTUN. The current JSTUN version also includes a STUN client
+and a STUN server.
+
+%package source
+Summary: Source code of %{name}
+Summary(pl.UTF-8): Kod źródłowy %{name}
+Group: Documentation
+Requires: jpackage-utils = 1.7.5-2
+
+%description source
+Source code of %{name}.
+
+%description source -l pl.UTF-8
+Kod źródłowy %{name}.
+
+%prep
+%setup -q -n STUN
+
+%build
+export JAVA_HOME=%{java_home}
+
+export CLASSPATH
+
+cd build
+%ant
+cd ..
+
+cd src
+%if %{with source}
+%jar cf ../%{name}.src.jar $(find -name '*.java')
+%endif
+cd ..
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}
+
+# jars
+cp -a target/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# source
+install -d $RPM_BUILD_ROOT%{_javasrcdir}
+cp -a %{name}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{name}.src.jar
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+
+%if %{with source}
+%files source
+%defattr(644,root,root,755)
+%{_javasrcdir}/%{name}.src.jar
+%endif
+
+%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team feedb...@pld-linux.org
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1 2011/02/24 19:28:46 pawelz
+- stun server, initial PLD release
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jstun/jstun.spec - shell wrapper
Author: pawelz Date: Thu Feb 24 20:02:09 2011 GMT
Module: packages Tag: HEAD
Log message:
- shell wrapper
Files affected:
packages/jstun:
jstun.spec (1.1 - 1.2)
Diffs:
Index: packages/jstun/jstun.spec
diff -u packages/jstun/jstun.spec:1.1 packages/jstun/jstun.spec:1.2
--- packages/jstun/jstun.spec:1.1 Thu Feb 24 20:28:46 2011
+++ packages/jstun/jstun.spec Thu Feb 24 21:02:04 2011
@@ -1,6 +1,5 @@
# $Revision$, $Date$
# TODO:
-# - shell wrapper
# - init scripts
#
# Conditional build:
@@ -8,14 +7,14 @@
%include /usr/lib/rpm/macros.java
-Summary: A Java-based STUN server.
+Summary: A Java-based STUN server
Summary(pl.UTF-8): Serwer STUN napisany w języku Java.
Name: jstun
Version: 0.7.3
Release: 0.1
License: GPL v2 or Apache v2
Group: Development/Languages/Java
-Source0: http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
+Source0: http://jstun.javawi.de/%{name}-%{version}.src.tar.gz
# Source0-md5: 0e2e0c5d52ba339a33472fc3a492e96d
URL: http://jstun.javawi.de
BuildRequires: ant
@@ -27,28 +26,28 @@
BuildRequires: rpmbuild(macros) = 1.555
%endif
BuildRequires: sed = 4.0
-# for %{_javadir}
+Requires: java-slf4j
Requires: jpackage-utils
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-JSTUN is a Java-based STUN (Simple Traversal of User Datagram Protocol (UDP)
-Through Network Address Translation (NAT)) implementation. STUN provides a mean
-for applications to discover the presence and type of firewalls or NATs between
-them and the public internet. Additionally, in presence of a NAT STUN can be
-used by applications to learn the public Internet Protocol (IP) address
+JSTUN is a Java-based STUN (Simple Traversal of User Datagram
+Protocol (UDP) Through Network Address Translation (NAT))
+implementation. STUN provides a mean for applications to discover the
+presence and type of firewalls or NATs between them and the public
+internet. Additionally, in presence of a NAT STUN can be used by
+applications to learn the public Internet Protocol (IP) address
assigned to the NAT.
-So far, most of the message headers and attributes as standardized in RFC 3489
-are part of JSTUN. The current JSTUN version also includes a STUN client
-and a STUN server.
+So far, most of the message headers and attributes as standardized in
+RFC 3489 are part of JSTUN. The current JSTUN version also
+includes a STUN client and a STUN server.
%package source
Summary: Source code of %{name}
Summary(pl.UTF-8): Kod źródłowy %{name}
Group: Documentation
-Requires: jpackage-utils = 1.7.5-2
%description source
Source code of %{name}.
@@ -59,6 +58,16 @@
%prep
%setup -q -n STUN
+cat jstun.sh '__EOF__'
+#!/bin/sh
+
+. %{_datadir}/java-utils/java-functions
+
+CLASSPATH=$(build-classpath jstun slf4j-api slf4j-jdk14)
+MAIN_CLASS=de.javawi.jstun.test.demo.StunServer
+run ${1:+$@}
+__EOF__
+
%build
export JAVA_HOME=%{java_home}
@@ -77,6 +86,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT%{_sbindir}
# jars
cp -a target/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -86,6 +96,7 @@
install -d $RPM_BUILD_ROOT%{_javasrcdir}
cp -a %{name}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{name}.src.jar
+install jstun.sh $RPM_BUILD_ROOT%{_sbindir}/jstun
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,6 +104,7 @@
%defattr(644,root,root,755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
+%attr(755,root,root) %{_sbindir}/jstun
%if %{with source}
%files source
@@ -106,6 +118,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.2 2011/02/24 20:02:04 pawelz
+- shell wrapper
+
Revision 1.1 2011/02/24 19:28:46 pawelz
- stun server, initial PLD release
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jstun/jstun.spec?r1=1.1r2=1.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: php/php.spec - enabled litespeed sapi by default - rel 5
Author: pawelz Date: Wed Feb 23 23:53:50 2011 GMT Module: packages Tag: HEAD Log message: - enabled litespeed sapi by default - rel 5 Files affected: packages/php: php.spec (1.919 - 1.920) Diffs: Index: packages/php/php.spec diff -u packages/php/php.spec:1.919 packages/php/php.spec:1.920 --- packages/php/php.spec:1.919 Thu Feb 24 00:38:26 2011 +++ packages/php/php.spec Thu Feb 24 00:53:44 2011 @@ -29,11 +29,11 @@ %bcond_withoci8# with Oracle oci8 extension module (BR: proprietary libs) %bcond_withinstantclient # build Oracle oci8 extension module against oracle-instantclient package %bcond_withsystem_gd # with system gd (we prefer internal since it enables few more features) -%bcond_withlitespeed # build litespeed module %bcond_without curl# without CURL extension module %bcond_without filter # without filter extension module %bcond_without imap# without IMAP extension module %bcond_without interbase # without InterBase extension module +%bcond_without litespeed # build litespeed module %bcond_without ldap# without LDAP extension module %bcond_without mm # without mm support for session storage %bcond_without mssql # without MS SQL extension module @@ -102,7 +102,7 @@ %undefine with_filter %endif -%definerel 4 +%definerel 5 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -3165,6 +3165,10 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.920 2011/02/23 23:53:44 pawelz +- enabled litespeed sapi by default +- rel 5 + Revision 1.919 2011/02/23 23:38:26 sparky - don't silent libtool instalation - rearranged litespeed build CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.919r2=1.920f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: openssl/openssl.spec - up to 1.0.0d - fixes CVE-2011-0014
Author: pawelz Date: Wed Feb 9 00:56:55 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.0.0d
- fixes CVE-2011-0014
Files affected:
packages/openssl:
openssl.spec (1.231 - 1.232)
Diffs:
Index: packages/openssl/openssl.spec
diff -u packages/openssl/openssl.spec:1.231 packages/openssl/openssl.spec:1.232
--- packages/openssl/openssl.spec:1.231 Fri Dec 3 19:45:25 2010
+++ packages/openssl/openssl.spec Wed Feb 9 01:56:50 2011
@@ -17,12 +17,12 @@
Summary(ru.UTF-8): Библиотеки и утилиты для соединений через Secure
Sockets Layer
Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднань через Secure Sockets
Layer
Name: openssl
-Version: 1.0.0c
+Version: 1.0.0d
Release: 1
License: Apache-like
Group: Libraries
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: ff8fb85610aef328315a9decbb2712e4
+# Source0-md5: 40b6ea380cc8a5bf9734c2f8bf7e701e
Source2: %{name}.1.pl
Source3: %{name}-ssl-certificate.sh
Source4: %{name}-c_rehash.sh
@@ -515,6 +515,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.232 2011/02/09 00:56:50 pawelz
+- up to 1.0.0d
+- fixes CVE-2011-0014
+
Revision 1.231 2010/12/03 18:45:25 arekm
- up to 1.0.0c (fixes CVE-2010-4180, CVE-2010-4252, corrects fix for
CVE-2010-3864)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.231r2=1.232f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openssl: openssl-1.0.0d.tar.gz
Files fetched: 1 STORED: ftp://ftp.openssl.org/source/openssl-1.0.0d.tar.gz 40b6ea380cc8a5bf9734c2f8bf7e701e openssl-1.0.0d.tar.gz Size: 4025484 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat-build.xml.patch - updated for 7.0.8
Author: pawelz Date: Sat Feb 5 13:01:29 2011 GMT
Module: packages Tag: DEVEL
Log message:
- updated for 7.0.8
Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.11 - 1.2.2.12)
Diffs:
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.11
packages/tomcat/tomcat-build.xml.patch:1.2.2.12
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.11 Fri Feb 4 20:18:31 2011
+++ packages/tomcat/tomcat-build.xml.patch Sat Feb 5 14:01:23 2011
@@ -1,6 +1,6 @@
apache-tomcat-7.0.6-src/build.xml.orig 2011-01-10 18:29:33.0
+0100
-+++ apache-tomcat-7.0.6-src/build.xml 2011-02-04 20:08:08.665489865 +0100
-@@ -419,38 +419,7 @@
+--- apache-tomcat-7.0.8-src/build.xml.orig 2011-02-04 13:52:30.0
+0100
apache-tomcat-7.0.8-src/build.xml 2011-02-05 13:57:36.775158905 +0100
+@@ -421,48 +421,7 @@
/target
@@ -10,12 +10,22 @@
-checkstyle config=res/checkstyle/checkstyle.xml
- fileset dir=.
-patternset refid=text.files /
+-include name=**/*.bat/
+-include name=**/*.sh/
+-exclude name=bin/setenv.*/
-exclude name=.*/**/
-exclude name=output/**/
-exclude name=modules/**/
-exclude name=**/*.mdl/
--!-- Exclude auto-generated files with known errors --
--exclude name=java/org/apache/el/parser/ELParser.java /
+-exclude name=**/*_2.xml/
+-exclude name=res/checkstyle/header-al2.txt/
+-!-- Exclude auto-generated files --
+-exclude name=java/org/apache/el/parser/ELParser*.java /
+-exclude name=java/org/apache/el/parser/JJTELParserState.java /
+-exclude name=java/org/apache/el/parser/Node.java /
+-exclude name=java/org/apache/el/parser/ParseException.java /
+-exclude name=java/org/apache/el/parser/SimpleCharStream.java /
+-exclude name=java/org/apache/el/parser/Token*.java /
-!-- Exclude these else Gump runs validate on them --
-exclude name=**/org/apache/tomcat/dbcp/**/
-exclude name=**/tomcat-deps/**/
@@ -40,7 +50,7 @@
!-- Compile internal server components --
javac srcdir=java destdir=${tomcat.classes}
-@@ -732,13 +701,6 @@
+@@ -744,13 +703,6 @@
target name=deploy depends=package,build-docs
description=Default. Builds a working Tomcat instance
@@ -54,7 +64,7 @@
!-- Copy scripts --
copy todir=${tomcat.build}/bin
fileset dir=bin
-@@ -994,7 +956,7 @@
+@@ -1006,7 +958,7 @@
/target
@@ -63,7 +73,7 @@
mkdir dir=${test.classes}/
!-- Compile --
javac srcdir=test destdir=${test.classes}
-@@ -1091,52 +1053,10 @@
+@@ -1103,52 +1055,10 @@
mkdir dir=${tomcat.extras}/webservices/
/target
@@ -117,7 +127,7 @@
replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons
encoding=ISO-8859-1
replacefilter token=org.apache.commons
-@@ -1158,7 +1078,8 @@
+@@ -1170,7 +1080,8 @@
file=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml
/
copy
todir=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src
@@ -127,7 +137,7 @@
fileset file=${log4j.jar} /
fileset file=${logkit.jar} /
fileset file=${servletapi.jar} /
-@@ -1238,18 +1159,6 @@
+@@ -1250,18 +1161,6 @@
depends=extras-prepare
description=Prepare to build web services extras package
@@ -146,7 +156,7 @@
copy file=${jaxrpc-lib.jar}
tofile=${tomcat.extras}/webservices/jaxrpc.jar /
copy file=${wsdl4j-lib.jar}
-@@ -1356,7 +1265,7 @@
+@@ -1368,7 +1267,7 @@
/target
@@ -155,7 +165,7 @@
mkdir dir=${tomcat.dist}/
mkdir dir=${tomcat.dist}/bin/
mkdir dir=${tomcat.dist}/conf/
-@@ -2080,301 +1989,7 @@
+@@ -2092,301 +1991,7 @@
description=Delete the default output folders
delete dir=${tomcat.output} /
/target
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.11r2=1.2.2.12f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat.spec - up to 7.0.8
Author: pawelz Date: Sat Feb 5 13:01:40 2011 GMT
Module: packages Tag: DEVEL
Log message:
- up to 7.0.8
Files affected:
packages/tomcat:
tomcat.spec (1.172.2.27 - 1.172.2.28)
Diffs:
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.27
packages/tomcat/tomcat.spec:1.172.2.28
--- packages/tomcat/tomcat.spec:1.172.2.27 Fri Feb 4 20:19:54 2011
+++ packages/tomcat/tomcat.spec Sat Feb 5 14:01:35 2011
@@ -13,12 +13,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet
%{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową
implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 7.0.6
+Version: 7.0.8
Release: 0.1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0:
http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 997290657ba0f4597991e0a98aade38e
+# Source0-md5: a2190918aa73c9b605c05812b523f405
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -533,6 +533,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.172.2.28 2011/02/05 13:01:35 pawelz
+- up to 7.0.8
+
Revision 1.172.2.27 2011/02/04 19:19:54 pawelz
- up to 7.0.6 (yay, the first stable 7.x release!)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.27r2=1.172.2.28f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: apache-tomcat-7.0.8-src.tar.gz commons-logging-1.1.1-src.tar.gz
Files fetched: 1 STORED: http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/src/apache-tomcat-7.0.8-src.tar.gz a2190918aa73c9b605c05812b523f405 apache-tomcat-7.0.8-src.tar.gz Size: 3819953 bytes ALREADY GOT: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat.spec - added CVE notes
Author: pawelz Date: Sat Feb 5 13:05:47 2011 GMT Module: packages Tag: DEVEL Log message: - added CVE notes Files affected: packages/tomcat: tomcat.spec (1.172.2.28 - 1.172.2.29) Diffs: Index: packages/tomcat/tomcat.spec diff -u packages/tomcat/tomcat.spec:1.172.2.28 packages/tomcat/tomcat.spec:1.172.2.29 --- packages/tomcat/tomcat.spec:1.172.2.28 Sat Feb 5 14:01:35 2011 +++ packages/tomcat/tomcat.spec Sat Feb 5 14:05:42 2011 @@ -533,11 +533,16 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.172.2.29 2011/02/05 13:05:42 pawelz +- added CVE notes + Revision 1.172.2.28 2011/02/05 13:01:35 pawelz - up to 7.0.8 +- fixes CVE-2011-0534 Revision 1.172.2.27 2011/02/04 19:19:54 pawelz - up to 7.0.6 (yay, the first stable 7.x release!) +- fixes CVE-2011-0013 Revision 1.172.2.26 2010/12/06 23:23:12 baggins - it's ok for webapps config to be missing, admin may have renamed them @@ -561,6 +566,7 @@ Revision 1.172.2.20 2010/10/22 14:29:13 pawelz - up to 7.0.4 - rel 0.1 (build.xml patch needs to be updated) +- fixes CVE-2010-3718 Revision 1.172.2.19 2010/09/07 14:34:55 pawelz - rel 2 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.28r2=1.172.2.29f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: tomcat/tomcat.spec - added CVE tags
Author: pawelz Date: Sat Feb 5 13:07:28 2011 GMT Module: packages Tag: HEAD Log message: - added CVE tags Files affected: packages/tomcat: tomcat.spec (1.185 - 1.186) Diffs: Index: packages/tomcat/tomcat.spec diff -u packages/tomcat/tomcat.spec:1.185 packages/tomcat/tomcat.spec:1.186 --- packages/tomcat/tomcat.spec:1.185 Fri Feb 4 20:53:03 2011 +++ packages/tomcat/tomcat.spec Sat Feb 5 14:07:23 2011 @@ -468,8 +468,12 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.186 2011/02/05 13:07:23 pawelz +- added CVE tags + Revision 1.185 2011/02/04 19:53:03 pawelz - up to 6.0.32 +- fixes CVE-2011-0534, CVE-2011-0013 Revision 1.184 2010/11/21 14:11:23 baggins - rel 5 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.185r2=1.186f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat-build.xml.patch - updated for tomcat 7.0.6
Author: pawelz Date: Fri Feb 4 19:18:36 2011 GMT
Module: packages Tag: DEVEL
Log message:
- updated for tomcat 7.0.6
Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.10 - 1.2.2.11)
Diffs:
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.10
packages/tomcat/tomcat-build.xml.patch:1.2.2.11
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.10 Mon Dec 6 12:45:15 2010
+++ packages/tomcat/tomcat-build.xml.patch Fri Feb 4 20:18:31 2011
@@ -1,24 +1,38 @@
apache-tomcat-7.0.2-src/build.xml.orig 2010-08-04 01:26:35.0
+0200
-+++ apache-tomcat-7.0.2-src/build.xml 2010-08-12 09:53:07.435556513 +0200
-@@ -410,24 +410,7 @@
+--- apache-tomcat-7.0.6-src/build.xml.orig 2011-01-10 18:29:33.0
+0100
apache-tomcat-7.0.6-src/build.xml 2011-02-04 20:08:08.665489865 +0100
+@@ -419,38 +419,7 @@
/target
- target name=validate depends=download-validate
if=${execute.validate}
-taskdef resource=checkstyletask.properties
- classpath=${checkstyle.jar} /
--checkstyle config=checkstyle.xml
+-checkstyle config=res/checkstyle/checkstyle.xml
- fileset dir=.
-patternset refid=text.files /
-exclude name=.*/**/
-exclude name=output/**/
-exclude name=modules/**/
-exclude name=**/*.mdl/
+-!-- Exclude auto-generated files with known errors --
+-exclude name=java/org/apache/el/parser/ELParser.java /
-!-- Exclude these else Gump runs validate on them --
-exclude name=**/org/apache/tomcat/dbcp/**/
-exclude name=**/tomcat-deps/**/
- /fileset
-/checkstyle
+-!-- javax package checks --
+-checkstyle config=res/checkstyle/javax-checkstyle.xml
+- fileset dir=java/javax
+-include name=**/*.java/
+- /fileset
+-/checkstyle
+-!-- org package checks --
+-checkstyle config=res/checkstyle/org-checkstyle.xml
+- fileset dir=java/org
+-include name=**/*.java/
+- /fileset
+-/checkstyle
- /target
-
- target name=compile depends=build-prepare,download-compile,validate
@@ -26,7 +40,7 @@
!-- Compile internal server components --
javac srcdir=java destdir=${tomcat.classes}
-@@ -701,13 +687,6 @@
+@@ -732,13 +701,6 @@
target name=deploy depends=package,build-docs
description=Default. Builds a working Tomcat instance
@@ -40,16 +54,16 @@
!-- Copy scripts --
copy todir=${tomcat.build}/bin
fileset dir=bin
-@@ -928,7 +907,7 @@
- description=Creates the experimental embedded release
- depends=embed,embed-sources,embed-extras /
+@@ -994,7 +956,7 @@
+
+ /target
- target name=test-compile depends=compile,download-test-compile
+ target name=test-compile depends=compile
mkdir dir=${test.classes}/
!-- Compile --
javac srcdir=test destdir=${test.classes}
-@@ -1027,51 +1006,10 @@
+@@ -1091,52 +1053,10 @@
mkdir dir=${tomcat.extras}/webservices/
/target
@@ -57,8 +71,9 @@
- depends=extras-prepare
- description=Prepare to build web services extras package
-
--antcall target=downloadfile
-- param name=sourcefile value=${commons-logging-src.loc}/
+-antcall target=downloadfile-2
+- param name=sourcefile.1 value=${commons-logging-src.loc.1}/
+- param name=sourcefile.2 value=${commons-logging-src.loc.2}/
- param name=destfile value=${commons-logging-src.tar.gz}/
- param name=destdir value=${commons-logging.home}/
-/antcall
@@ -102,7 +117,7 @@
replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons
encoding=ISO-8859-1
replacefilter token=org.apache.commons
-@@ -1050,7 +1000,8 @@
+@@ -1158,7 +1078,8 @@
file=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml
/
copy
todir=${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src
@@ -112,7 +127,7 @@
fileset file=${log4j.jar} /
fileset file=${logkit.jar} /
fileset file=${servletapi.jar} /
-@@ -1137,18 +1100,6 @@
+@@ -1238,18 +1159,6 @@
depends=extras-prepare
description=Prepare to build web services extras package
@@ -131,7 +146,7 @@
copy file=${jaxrpc-lib.jar}
tofile=${tomcat.extras}/webservices/jaxrpc.jar /
copy file=${wsdl4j-lib.jar}
-@@ -1255,7 +1206,7 @@
+@@ -1356,7 +1265,7 @@
/target
@@ -140,11 +155,12 @@
mkdir dir=${tomcat.dist}/
mkdir dir=${tomcat.dist}/bin/
mkdir dir=${tomcat.dist}/conf/
-@@ -1968,244 +1919,6 @@
+@@ -2080,301 +1989,7 @@
+ description=Delete the default output folders
delete dir=${tomcat.output} /
/target
packages (DEVEL): tomcat/tomcat.spec - up to 7.0.6 (yay, the first stable 7...
Author: pawelz Date: Fri Feb 4 19:20:00 2011 GMT
Module: packages Tag: DEVEL
Log message:
- up to 7.0.6 (yay, the first stable 7.x release!)
Files affected:
packages/tomcat:
tomcat.spec (1.172.2.26 - 1.172.2.27)
Diffs:
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.26
packages/tomcat/tomcat.spec:1.172.2.27
--- packages/tomcat/tomcat.spec:1.172.2.26 Tue Dec 7 00:23:12 2010
+++ packages/tomcat/tomcat.spec Fri Feb 4 20:19:54 2011
@@ -6,8 +6,6 @@
%definejspapiver 2.2
%defineservletapiver 3.0
-%definesubver beta
-%definerel 0.3
# Java Commons Logging version. Must be = 1.1.
%definejclver 1.1.1
@@ -15,12 +13,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet
%{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową
implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 7.0.5
-Release: 0.%{subver}.%{rel}
+Version: 7.0.6
+Release: 0.1
License: Apache v2.0
Group: Networking/Daemons/Java
-Source0:
http://www.apache.org/dist/tomcat/tomcat-7/v%{version}-%{subver}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 8fec5203e6b7920f6b18a41149910629
+Source0:
http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
+# Source0-md5: 997290657ba0f4597991e0a98aade38e
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -535,6 +533,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.172.2.27 2011/02/04 19:19:54 pawelz
+- up to 7.0.6 (yay, the first stable 7.x release!)
+
Revision 1.172.2.26 2010/12/06 23:23:12 baggins
- it's ok for webapps config to be missing, admin may have renamed them
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.26r2=1.172.2.27f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: apache-tomcat-7.0.6-src.tar.gz commons-logging-1.1.1-src.tar.gz
Files fetched: 1 STORED: http://www.apache.org/dist/tomcat/tomcat-7/v7.0.6/src/apache-tomcat-7.0.6-src.tar.gz 997290657ba0f4597991e0a98aade38e apache-tomcat-7.0.6-src.tar.gz Size: 3811664 bytes ALREADY GOT: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: tomcat/tomcat-extras.xml.patch - updated for 6.0.32
Author: pawelz Date: Fri Feb 4 19:52:34 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated for 6.0.32
Files affected:
packages/tomcat:
tomcat-extras.xml.patch (1.3 - 1.4)
Diffs:
Index: packages/tomcat/tomcat-extras.xml.patch
diff -u packages/tomcat/tomcat-extras.xml.patch:1.3
packages/tomcat/tomcat-extras.xml.patch:1.4
--- packages/tomcat/tomcat-extras.xml.patch:1.3 Mon Feb 1 23:08:09 2010
+++ packages/tomcat/tomcat-extras.xml.patch Fri Feb 4 20:52:29 2011
@@ -1,33 +1,113 @@
extras.xml.orig2010-01-19 14:43:39.0 +0100
-+++ extras.xml 2010-02-01 23:03:52.0 +0100
-@@ -110,11 +110,6 @@
-
- target name=commons-logging
+--- extras.xml.orig2011-02-02 20:07:31.0 +0100
extras.xml 2011-02-04 20:28:23.759726852 +0100
+@@ -108,44 +108,7 @@
+ delete dir=${tomcat.extras}/
+ /target
+- target name=commons-logging-prepare
+- depends=prepare
+- description=Prepare to build web services extras package
+-
-antcall target=downloadfile
- param name=sourcefile value=${commons-logging-src.loc}/
-- param name=destfile
value=${tomcat.extras}/logging/commons-logging-src.tar.gz/
-- param name=destdir value=${tomcat.extras}/logging//
+- param name=destfile value=${commons-logging-src.tar.gz}/
+- param name=destdir value=${commons-logging.home}/
+-/antcall
+-
+-antcall target=downloadfile
+- param name=sourcefile value=${avalon-framework.loc}/
+- param name=destfile value=${avalon-framework.jar}/
+- param name=destdir value=${avalon-framework.home}/
+-/antcall
+-
+-antcall target=downloadfile
+- param name=sourcefile value=${log4j.loc}/
+- param name=destfile value=${log4j.jar}/
+- param name=destdir value=${log4j.home}/
+-/antcall
+-
+-antcall target=downloadfile
+- param name=sourcefile value=${logkit.loc}/
+- param name=destfile value=${logkit.jar}/
+- param name=destdir value=${logkit.home}/
+-/antcall
+-
+-antcall target=downloadfile
+- param name=sourcefile value=${servletapi.loc}/
+- param name=destfile value=${servletapi.jar}/
+- param name=destdir value=${servletapi.home}/
-/antcall
- gunzip src=${tomcat.extras}/logging/commons-logging-src.tar.gz
- dest=${tomcat.extras}/logging/commons-logging-src.tar/
- untar src=${tomcat.extras}/logging/commons-logging-src.tar
-@@ -202,18 +197,6 @@
+-
+- /target
+-
+ target name=commons-logging
+- depends=commons-logging-prepare
+ description=Build JULI for log4j extras package
- mkdir dir=${tomcat.extras}/webservices/
+ gunzip src=${commons-logging-src.tar.gz}
+@@ -236,18 +199,6 @@
+ depends=prepare
+ description=Prepare to build web services extras package
-antcall target=downloadfile
-- param name=sourcefile value=${jaxrpc-src.loc}/
-- param name=destfile value=${tomcat.extras}/webservices/jaxrpc.jar/
-- param name=destdir value=${tomcat.extras}/webservices//
+- param name=sourcefile value=${jaxrpc-lib.loc}/
+- param name=destfile value=${jaxrpc-lib.jar}/
+- param name=destdir value=${jaxrpc-lib.home}/
-/antcall
-
-antcall target=downloadfile
-- param name=sourcefile value=${wsdl4j-src.loc}/
-- param name=destfile value=${tomcat.extras}/webservices/wsdl4j.jar/
-- param name=destdir value=${tomcat.extras}/webservices//
+- param name=sourcefile value=${wsdl4j-lib.loc}/
+- param name=destfile value=${wsdl4j-lib.jar}/
+- param name=destdir value=${wsdl4j-lib.home}/
-/antcall
-
+ copy file=${jaxrpc-lib.jar}
+ tofile=${tomcat.extras}/webservices/jaxrpc.jar /
+ copy file=${wsdl4j-lib.jar}
+@@ -326,25 +277,11 @@
+ /condition
+ /target
+
+- target name=setproxy depends=proxyflags if=useproxy
+-taskdef name=setproxy
+-classname=org.apache.tools.ant.taskdefs.optional.net.SetProxy /
+-setproxy proxyhost=${proxy.host} proxyport=${proxy.port}
+- proxyuser=${proxy.user} proxypassword=${proxy.password} /
+-echo message=Using ${proxy.host}:${proxy.port} to download
${sourcefile}/
+- /target
+-
+ target name=testexist
+ echo message=Testing for ${destfile}/
+ available file=${destfile} property=exist/
+ /target
+
+- target name=downloadfile unless=exist depends=setproxy,testexist
+-!-- Download extract the file --
+-mkdir dir=${destdir} /
+-get src=${sourcefile} dest=${destfile} /
+- /target
+-
+ !-- Helper target, used to create a md5 checksum file --
+ !-- Requires 'file' as a parameter. --
+ target name=md5sum
+--- extras.xml~2011-02-04 20:30:36.817322838 +0100
extras.xml 2011-02-04 20:48:43.431125625 +0100
+@@ -195,18 +195,7 @@
+ /antcall
+ /target
+
+- target name=webservices-prepare
packages: tomcat/tomcat.spec - up to 6.0.32
Author: pawelz Date: Fri Feb 4 19:53:08 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 6.0.32
Files affected:
packages/tomcat:
tomcat.spec (1.184 - 1.185)
Diffs:
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.184 packages/tomcat/tomcat.spec:1.185
--- packages/tomcat/tomcat.spec:1.184 Sun Nov 21 15:11:23 2010
+++ packages/tomcat/tomcat.spec Fri Feb 4 20:53:03 2011
@@ -11,12 +11,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet
%{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową
implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 6.0.29
-Release: 5
+Version: 6.0.32
+Release: 1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0:
http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 260de5ae62f415b9c085c5aeed4ef24c
+# Source0-md5: 19a1eaa9c9938b520d3c360d8cf4af22
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -468,6 +468,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.185 2011/02/04 19:53:03 pawelz
+- up to 6.0.32
+
Revision 1.184 2010/11/21 14:11:23 baggins
- rel 5
- added example configs for userdir URIs (/~user)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.184r2=1.185f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: apache-tomcat-6.0.32-src.tar.gz
Files fetched: 1 STORED: http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/src/apache-tomcat-6.0.32-src.tar.gz 19a1eaa9c9938b520d3c360d8cf4af22 apache-tomcat-6.0.32-src.tar.gz Size: 3394648 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: reptyr/reptyr.spec (NEW) - new spec: A tool for reptying programs.
Author: pawelz Date: Thu Feb 3 19:09:12 2011 GMT
Module: packages Tag: HEAD
Log message:
- new spec: A tool for reptying programs.
Files affected:
packages/reptyr:
reptyr.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/reptyr/reptyr.spec
diff -u /dev/null packages/reptyr/reptyr.spec:1.1
--- /dev/null Thu Feb 3 20:09:12 2011
+++ packages/reptyr/reptyr.spec Thu Feb 3 20:09:06 2011
@@ -0,0 +1,56 @@
+# $Revision$, $Date$
+
+%definerel 0.1
+%definesubver 2011.02.03
+
+Summary: A tool for re-ptying programs
+Summary(pl.UTF-8): Narzędzie do re-ptyjowania programów
+Name: reptyr
+Version: 0
+Release: 0.%{subver}.%{rel}
+License: BSD-like
+Group: Applications
+Source0:
https://github.com/nelhage/reptyr/tarball/master/%{name}-%{subver}.tar.gz
+# Source0-md5: 2b48b412a654e8c22ad53a6349c6b0a1
+URL: https://github.com/nelhage/reptyr
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+reptyr is a utility for taking an existing running program and
+attaching it to a new terminal. Started a long-running process over
+ssh, but have to leave and don't want to interrupt it? Just start a
+screen, use reptyr to grab it, and then kill the ssh session and head
+on home.
+
+%prep
+%setup -q -c -n %{name}-%{subver}
+mv nelhage-reptyr-*/* .
+
+%build
+%{__make} \
+ CFLAGS=%{rpmcflags} \
+ LDFLAGS=%{rpmldflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ PREFIX=%{_prefix} \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc BUGS NOTES README
+%attr(755,root,root) %{_bindir}/reptyr
+
+%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team feedb...@pld-linux.org
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1 2011/02/03 19:09:06 pawelz
+- new spec: A tool for reptying programs.
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: reptyr: reptyr-2011.02.03.tar.gz
Files fetched: 1 STORED: https://github.com/nelhage/reptyr/tarball/master/reptyr-2011.02.03.tar.gz 2b48b412a654e8c22ad53a6349c6b0a1 reptyr-2011.02.03.tar.gz Size: 9753 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: confluence/confluence.spec - up to 3.4.6
Author: pawelz Date: Sun Jan 23 12:22:35 2011 GMT
Module: packages Tag: HEAD
Log message:
- up to 3.4.6
Files affected:
packages/confluence:
confluence.spec (1.27 - 1.28)
Diffs:
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.27
packages/confluence/confluence.spec:1.28
--- packages/confluence/confluence.spec:1.27Thu Dec 9 01:46:21 2010
+++ packages/confluence/confluence.spec Sun Jan 23 13:22:30 2011
@@ -17,11 +17,11 @@
# See Atlassian_EULA_3.0.pdf for more details.
# RELEASE INFO:
-# This version of confluence was released on the 21st September 2010
+# This version of Confluence was released on the 4th January 2011
%if 0
# Download sources manually:
-wget -c
http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.3.3.tar.gz
+wget -c
http://www.atlassian.com/software/confluence/downloads/binary/confluence-3.4.6.tar.gz
wget -c
http://confluence.atlassian.com/download/attachments/173229/confluence-pl_PL-plugin-1.0.jar
wget -c http://www.atlassian.com/about/licensing/Atlassian_EULA_3.0.pdf
%endif
@@ -32,12 +32,12 @@
%include /usr/lib/rpm/macros.java
Summary: Confluence - Enterprise wiki
Name: confluence
-Version: 3.4.3
+Version: 3.4.6
Release: 1
License: Proprietary, not distributable
Group: Networking/Daemons/Java/Servlets
Source0: %{name}-%{version}.tar.gz
-# NoSource0-md5: 3ed77fbdc17c0cee41795d4fff7fa27b
+# NoSource0-md5: 062714800d8312cdd2aad7d305204654
NoSource: 0
Source1: %{name}-context.xml
Source2: %{name}-init.properties
@@ -185,6 +185,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.28 2011/01/23 12:22:30 pawelz
+- up to 3.4.6
+
Revision 1.27 2010/12/09 00:46:21 pawelz
- %config(missingok) context config.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.27r2=1.28f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: subversion/subversion.spec - BR: ruby-rubygems - fix build with n...
Author: pawelz Date: Mon Jan 17 22:25:00 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: ruby-rubygems
- fix build with net_client_only
- adapter: sorted BRs
Files affected:
packages/subversion:
subversion.spec (1.296 - 1.297)
Diffs:
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.296
packages/subversion/subversion.spec:1.297
--- packages/subversion/subversion.spec:1.296 Sat Jan 15 23:03:08 2011
+++ packages/subversion/subversion.spec Mon Jan 17 23:24:55 2011
@@ -75,6 +75,7 @@
%endif
%if %{with ruby}
BuildRequires: ruby-devel
+BuildRequires: ruby-rubygems
BuildRequires: swig-ruby = 1.3.24
%endif
%if %{with javahl}
@@ -88,8 +89,8 @@
BuildRequires: bison
BuildRequires: expat-devel
BuildRequires: gettext-devel
-%{?with_gnome:BuildRequires: libgnome-keyring-devel}
%{?with_kwallet:BuildRequires: kde4-kdelibs-devel}
+%{?with_gnome:BuildRequires: libgnome-keyring-devel}
BuildRequires: libtool = 1.4-9
BuildRequires: pkgconfig
BuildRequires: rpm-pythonprov
@@ -561,8 +562,10 @@
install tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{?with_javahl:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}}
+%if %{without net_client_only}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la
+%endif
%if %{with gnome} || %{with kwallet}
# dlopened by soname (libsvn_auth_*-1.so.0)
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_auth_*-1.{so,la,a}
@@ -666,8 +669,10 @@
%attr(755,root,root) %ghost %{_libdir}/libsvn_diff-1.so.0
%attr(755,root,root) %{_libdir}/libsvn_fs-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_fs-1.so.0
+%if %{without net_client_only}
%attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_base-1.so.0
+%endif
%attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_fs-1.so.0
%attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so.*.*.*
@@ -693,7 +698,9 @@
%attr(755,root,root) %{_libdir}/libsvn_delta-1.so
%attr(755,root,root) %{_libdir}/libsvn_diff-1.so
%attr(755,root,root) %{_libdir}/libsvn_fs-1.so
+%if %{without net_client_only}
%attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so
+%endif
%attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so
%attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
%attr(755,root,root) %{_libdir}/libsvn_ra-1.so
@@ -707,7 +714,9 @@
%{_libdir}/libsvn_delta-1.la
%{_libdir}/libsvn_diff-1.la
%{_libdir}/libsvn_fs-1.la
+%if %{without net_client_only}
%{_libdir}/libsvn_fs_base-1.la
+%endif
%{_libdir}/libsvn_fs_fs-1.la
%{_libdir}/libsvn_fs_util-1.la
%{_libdir}/libsvn_ra-1.la
@@ -726,7 +735,9 @@
%{_libdir}/libsvn_delta-1.a
%{_libdir}/libsvn_diff-1.a
%{_libdir}/libsvn_fs-1.a
+%if %{without net_client_only}
%{_libdir}/libsvn_fs_base-1.a
+%endif
%{_libdir}/libsvn_fs_fs-1.a
%{_libdir}/libsvn_fs_util-1.a
%{_libdir}/libsvn_ra-1.a
@@ -857,6 +868,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.297 2011/01/17 22:24:55 pawelz
+- BR: ruby-rubygems
+- fix build with net_client_only
+- adapter: sorted BRs
+
Revision 1.296 2011/01/15 22:03:08 charles
- updated BRs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.296r2=1.297f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (test): test/test.spec - release 13
Author: pawelz Date: Sat Jan 8 14:59:53 2011 GMT
Module: packages Tag: test
Log message:
- release 13
Files affected:
packages/test:
test.spec (1.16.4.66.2.1.2.7.2.32 - 1.16.4.66.2.1.2.7.2.33)
Diffs:
Index: packages/test/test.spec
diff -u packages/test/test.spec:1.16.4.66.2.1.2.7.2.32
packages/test/test.spec:1.16.4.66.2.1.2.7.2.33
--- packages/test/test.spec:1.16.4.66.2.1.2.7.2.32 Mon Nov 15 20:03:05 2010
+++ packages/test/test.spec Sat Jan 8 15:59:48 2011
@@ -4,7 +4,7 @@
Summary: testing something
Name: test
Version: 8.72
-Release: 12
+Release: 13
#Release: %{rel}
License: GPL
Group: Applications/System
@@ -42,6 +42,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.16.4.66.2.1.2.7.2.33 2011/01/08 14:59:48 pawelz
+- release 13
+
Revision 1.16.4.66.2.1.2.7.2.32 2010/11/15 19:03:05 baggins
- release 12
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/test/test.spec?r1=1.16.4.66.2.1.2.7.2.32r2=1.16.4.66.2.1.2.7.2.33f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (test): test/test.spec - release 13¼
Author: pawelz Date: Sat Jan 8 15:01:31 2011 GMT
Module: packages Tag: test
Log message:
- release 13¼
Files affected:
packages/test:
test.spec (1.16.4.66.2.1.2.7.2.33 - 1.16.4.66.2.1.2.7.2.34)
Diffs:
Index: packages/test/test.spec
diff -u packages/test/test.spec:1.16.4.66.2.1.2.7.2.33
packages/test/test.spec:1.16.4.66.2.1.2.7.2.34
--- packages/test/test.spec:1.16.4.66.2.1.2.7.2.33 Sat Jan 8 15:59:48 2011
+++ packages/test/test.spec Sat Jan 8 16:01:26 2011
@@ -4,7 +4,7 @@
Summary: testing something
Name: test
Version: 8.72
-Release: 13
+Release: 13¼
#Release: %{rel}
License: GPL
Group: Applications/System
@@ -42,6 +42,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.16.4.66.2.1.2.7.2.34 2011/01/08 15:01:26 pawelz
+- release 13¼
+
Revision 1.16.4.66.2.1.2.7.2.33 2011/01/08 14:59:48 pawelz
- release 13
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/test/test.spec?r1=1.16.4.66.2.1.2.7.2.33r2=1.16.4.66.2.1.2.7.2.34f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-commons-codec/java-commons-codec.spec - fix builddeps: - d...
Author: pawelz Date: Thu Jan 6 20:54:07 2011 GMT
Module: packages Tag: HEAD
Log message:
- fix builddeps:
- do not force gcj
- junit is java-junit now
- bump rpmbuild macros BR
- rel 6
Files affected:
packages/java-commons-codec:
java-commons-codec.spec (1.13 - 1.14)
Diffs:
Index: packages/java-commons-codec/java-commons-codec.spec
diff -u packages/java-commons-codec/java-commons-codec.spec:1.13
packages/java-commons-codec/java-commons-codec.spec:1.14
--- packages/java-commons-codec/java-commons-codec.spec:1.13Tue Feb 17
08:12:23 2009
+++ packages/java-commons-codec/java-commons-codec.spec Thu Jan 6 21:54:02 2011
@@ -5,7 +5,7 @@
Summary(pl.UTF-8): Pakiet Commons Codec
Name: java-commons-codec
Version: 1.3
-Release: 5
+Release: 6
License: Apache
Group: Libraries/Java
Source0:
http://www.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz
@@ -14,12 +14,12 @@
URL: http://commons.apache.org/codec/
BuildRequires: ant = 1.6.2
BuildRequires: ant-junit
-BuildRequires: java-gcj-compat-devel
BuildRequires: jpackage-utils
-BuildRequires: junit
+BuildRequires: java-junit
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) = 1.300
+BuildRequires: rpmbuild(macros) = 1.556
BuildRequires: sed = 4.0
+%buildrequires_jdk
Provides: commons-codec
Obsoletes: commons-codec
Obsoletes: jakarta-commons-codec
@@ -106,6 +106,13 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.14 2011/01/06 20:54:02 pawelz
+- fix builddeps:
+ - do not force gcj
+ - junit is java-junit now
+ - bump rpmbuild macros BR
+- rel 6
+
Revision 1.13 2009/02/17 07:12:23 pawelz
- rebuild with java-gcj-compat-devel
- correct dir for javadoc
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-codec/java-commons-codec.spec?r1=1.13r2=1.14f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (JDKBR): test/test.spec - BC: junit
Author: pawelz Date: Thu Jan 6 20:55:01 2011 GMT
Module: packages Tag: JDKBR
Log message:
- BC: junit
Files affected:
packages/test:
test.spec (1.16.4.66.2.1.6.3 - 1.16.4.66.2.1.6.4)
Diffs:
Index: packages/test/test.spec
diff -u packages/test/test.spec:1.16.4.66.2.1.6.3
packages/test/test.spec:1.16.4.66.2.1.6.4
--- packages/test/test.spec:1.16.4.66.2.1.6.3 Mon Sep 27 18:04:08 2010
+++ packages/test/test.spec Thu Jan 6 21:54:56 2011
@@ -10,6 +10,7 @@
BuildConflicts:java-sun-jre
BuildConflicts:java-sun-tools
BuildConflicts:java-gcj-compat-base
+BuildConflicts: junit
BuildRequires: icedtea6
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,6 +36,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.16.4.66.2.1.6.4 2011/01/06 20:54:56 pawelz
+- BC: junit
+
Revision 1.16.4.66.2.1.6.3 2010/09/27 16:04:08 pawelz
- BC: java-gcj-compat-base
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/test/test.spec?r1=1.16.4.66.2.1.6.3r2=1.16.4.66.2.1.6.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101210.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101210.tar.bz2 240c7203a2b8c15557710dcbc8fbf8c6 ekg2-20101210.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - plugin-scripting-python R: python-modules - rel 3
Author: pawelz Date: Tue Dec 28 16:16:56 2010 GMT
Module: packages Tag: HEAD
Log message:
- plugin-scripting-python R: python-modules
- rel 3
Files affected:
packages/ekg2:
ekg2.spec (1.139 - 1.140)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.139 packages/ekg2/ekg2.spec:1.140
--- packages/ekg2/ekg2.spec:1.139 Fri Dec 10 12:26:48 2010
+++ packages/ekg2/ekg2.spec Tue Dec 28 17:16:50 2010
@@ -28,7 +28,7 @@
%definesubver 20101210
%endif
-%definerel 2
+%definerel 3
%if %{with sqlite}
%undefine sqlite3
@@ -303,6 +303,7 @@
Summary(pl.UTF-8): Wtyczka języka Python dla ekg2
Group: Applications/Communications
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: python-modules
%description plugin-scripting-python
Python scripting plugin for ekg2.
@@ -561,6 +562,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.140 2010/12/28 16:16:50 pawelz
+- plugin-scripting-python R: python-modules
+- rel 3
+
Revision 1.139 2010/12/10 11:26:48 pawelz
- added missing %dir
- rel 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.139r2=1.140f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101210.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101210.tar.bz2 240c7203a2b8c15557710dcbc8fbf8c6 ekg2-20101210.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - --with git: allow to specify branch (as %ekg2bra...
Author: pawelz Date: Tue Dec 28 21:07:23 2010 GMT
Module: packages Tag: HEAD
Log message:
- --with git: allow to specify branch (as %ekg2branch macro)
Files affected:
packages/ekg2:
ekg2.spec (1.140 - 1.141)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.140 packages/ekg2/ekg2.spec:1.141
--- packages/ekg2/ekg2.spec:1.140 Tue Dec 28 17:16:50 2010
+++ packages/ekg2/ekg2.spec Tue Dec 28 22:07:18 2010
@@ -339,11 +339,15 @@
%if %{with git}
%setup -q -T -c -n %{name}-%{subver}
repo=%ekg2repo
+branch=%ekg2branch
if [ $repo = %%ekg2repo ]; then
repo=git://github.com/leafnode/ekg2.git
fi
+if [ $branch = %%ekg2branch ]; then
+repo=master
+fi
git init
-git fetch $repo master
+git fetch $repo $branch
git checkout FETCH_HEAD
%else
%setup -q -c -n %{name}-%{subver}
@@ -562,6 +566,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.141 2010/12/28 21:07:18 pawelz
+- --with git: allow to specify branch (as %ekg2branch macro)
+
Revision 1.140 2010/12/28 16:16:50 pawelz
- plugin-scripting-python R: python-modules
- rel 3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.140r2=1.141f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101210.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101210.tar.bz2 240c7203a2b8c15557710dcbc8fbf8c6 ekg2-20101210.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - Reverted Epoch, accidentally decreased in cvs re...
Author: pawelz Date: Tue Dec 28 23:50:40 2010 GMT
Module: packages Tag: HEAD
Log message:
- Reverted Epoch, accidentally decreased in cvs rev 1.138
- rel 4
Files affected:
packages/ekg2:
ekg2.spec (1.141 - 1.142)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.141 packages/ekg2/ekg2.spec:1.142
--- packages/ekg2/ekg2.spec:1.141 Tue Dec 28 22:07:18 2010
+++ packages/ekg2/ekg2.spec Wed Dec 29 00:50:35 2010
@@ -28,7 +28,7 @@
%definesubver 20101210
%endif
-%definerel 3
+%definerel 4
%if %{with sqlite}
%undefine sqlite3
@@ -39,7 +39,7 @@
Name: ekg2
Version: 0.4
Release: 0.%{subver}.%{rel}
-Epoch: 1
+Epoch: 2
License: GPL v2+
Group: Applications/Communications
%if %{without git}
@@ -566,6 +566,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.142 2010/12/28 23:50:35 pawelz
+- Reverted Epoch, accidentally decreased in cvs rev 1.138
+- rel 4
+
Revision 1.141 2010/12/28 21:07:18 pawelz
- --with git: allow to specify branch (as %ekg2branch macro)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.141r2=1.142f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: GeoIP-db-City/GeoIP-db-City.spec - do not provide %{_datadir}/Geo...
Author: pawelz Date: Mon Dec 27 12:56:06 2010 GMT
Module: packages Tag: HEAD
Log message:
- do not provide %{_datadir}/GeoIP directory. It is provided by GeoIP-libs.
- rel 2
Files affected:
packages/GeoIP-db-City:
GeoIP-db-City.spec (1.20 - 1.21)
Diffs:
Index: packages/GeoIP-db-City/GeoIP-db-City.spec
diff -u packages/GeoIP-db-City/GeoIP-db-City.spec:1.20
packages/GeoIP-db-City/GeoIP-db-City.spec:1.21
--- packages/GeoIP-db-City/GeoIP-db-City.spec:1.20 Wed Dec 8 11:56:19 2010
+++ packages/GeoIP-db-City/GeoIP-db-City.spec Mon Dec 27 13:56:01 2010
@@ -4,7 +4,7 @@
Name: GeoIP-db-City
# Updated every month:
Version: 2010.12.05
-Release: 1
+Release: 2
License: OPEN DATA LICENSE (see LICENSE.txt)
Group: Applications/Databases
Source0:
http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
@@ -55,7 +55,6 @@
%files
%defattr(644,root,root,755)
%doc *.txt
-%dir %{_datadir}/GeoIP
%{_datadir}/GeoIP/*.dat
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -64,6 +63,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.21 2010/12/27 12:56:01 pawelz
+- do not provide %{_datadir}/GeoIP directory. It is provided by GeoIP-libs.
+- rel 2
+
Revision 1.20 2010/12/08 10:56:19 glen
- 2010.12.05
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/GeoIP-db-City/GeoIP-db-City.spec?r1=1.20r2=1.21f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php: php-5.3.4.tar.bz2 php-litespeed-5.5.tgz
Files fetched: 1 ALREADY GOT: http://www.php.net/distributions/php-5.3.4.tar.bz2 2c069d8f690933e3bf6a8741ed818150 php-5.3.4.tar.bz2 STORED: http://litespeedtech.com/packages/lsapi/php-litespeed-5.5.tgz 9d58485d5fd6b5f5fefcec41b9ce283e php-litespeed-5.5.tgz Size: 27256 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: php/php.spec - litespeed_version 5.5 - rel 2
Author: pawelz Date: Tue Dec 14 14:47:10 2010 GMT
Module: packages Tag: HEAD
Log message:
- litespeed_version 5.5
- rel 2
Files affected:
packages/php:
php.spec (1.911 - 1.912)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.911 packages/php/php.spec:1.912
--- packages/php/php.spec:1.911 Sun Dec 12 22:31:33 2010
+++ packages/php/php.spec Tue Dec 14 15:47:05 2010
@@ -66,7 +66,7 @@
%define apxs1 /usr/sbin/apxs1
%defineapxs2 /usr/sbin/apxs
-%definelitespeed_version 5.4
+%definelitespeed_version 5.5
# disable all sapis
%if %{with gcov}
@@ -102,7 +102,7 @@
%undefine with_filter
%endif
-%definerel 1
+%definerel 2
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -129,7 +129,7 @@
Source13: dep-tests.sh
Source14: skip-tests.sh
Source15:
http://litespeedtech.com/packages/lsapi/%{name}-litespeed-%{litespeed_version}.tgz
-# Source15-md5:8738d9e3a232c2a0518c514802c66d73
+# Source15-md5:9d58485d5fd6b5f5fefcec41b9ce283e
Patch0:%{name}-shared.patch
Patch1:%{name}-pldlogo.patch
Patch2:%{name}-mail.patch
@@ -3161,6 +3161,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.912 2010/12/14 14:47:05 pawelz
+- litespeed_version 5.5
+- rel 2
+
Revision 1.911 2010/12/12 21:31:33 arekm
- rel 1
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.911r2=1.912f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel-xenU/linux-2.6-vs2.3.patch - updated for 2.6.36.2
Author: pawelz Date: Tue Dec 14 01:34:26 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated for 2.6.36.2
Files affected:
packages/kernel-xenU:
linux-2.6-vs2.3.patch (1.12 - 1.13)
Diffs:
Index: packages/kernel-xenU/linux-2.6-vs2.3.patch
diff -u packages/kernel-xenU/linux-2.6-vs2.3.patch:1.12
packages/kernel-xenU/linux-2.6-vs2.3.patch:1.13
--- packages/kernel-xenU/linux-2.6-vs2.3.patch:1.12 Wed Sep 22 12:28:42 2010
+++ packages/kernel-xenU/linux-2.6-vs2.3.patch Tue Dec 14 02:34:21 2010
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/Kconfig
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/Kconfig
linux-2.6.35.5/arch/alpha/Kconfig 2010-08-02 16:51:53.0 +0200
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/Kconfig2010-08-02
17:05:05.0 +0200
-@@ -681,6 +681,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.36.2/arch/alpha/Kconfig
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig
+--- linux-2.6.36.2/arch/alpha/Kconfig 2010-10-21 13:06:45.0 +0200
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/Kconfig 2010-10-21
13:09:36.0 +0200
+@@ -677,6 +677,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,10 +10,10 @@
source security/Kconfig
source crypto/Kconfig
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/entry.S
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/entry.S
linux-2.6.35.5/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.0
+0200
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/entry.S 2010-08-02
17:05:05.0 +0200
-@@ -874,24 +874,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/entry.S
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S
+--- linux-2.6.36.2/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.0
+0200
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/entry.S 2010-10-21
13:09:36.0 +0200
+@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.entsys_getxpid
sys_getxpid:
@@ -45,21 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/osf_sys.c
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c
linux-2.6.35.5/arch/alpha/kernel/osf_sys.c 2010-07-07 18:30:51.0
+0200
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c 2010-08-02
17:05:05.0 +0200
-@@ -866,7 +866,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(ktv);
-+ vx_gettimeofday(ktv);
- if (put_tv32(tv, ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/ptrace.c
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c
linux-2.6.35.5/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.0
+0200
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c2010-08-02
17:05:05.0 +0200
+diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/ptrace.c
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c
+--- linux-2.6.36.2/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.0
+0200
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/ptrace.c 2010-10-21
13:09:36.0 +0200
@@ -13,6 +13,7 @@
#include linux/user.h
#include linux/security.h
@@ -68,9 +56,9 @@
#include asm/uaccess.h
#include asm/pgtable.h
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/systbls.S
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/systbls.S
linux-2.6.35.5/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.0
+0100
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/systbls.S 2010-08-02
17:05:05.0 +0200
+diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/systbls.S
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S
+--- linux-2.6.36.2/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.0
+0200
linux-2.6.36.2-vs2.3.0.36.38.2/arch/alpha/kernel/systbls.S 2010-10-21
13:09:36.0 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,10 +68,10 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/traps.c
linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/traps.c
linux-2.6.35.5/arch/alpha/kernel/traps.c 2010-07-07 18:30:51.0
+0200
-+++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/traps.c 2010-08-02
17:05:05.0 +0200
-@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-2.6.36.2/arch/alpha/kernel/traps.c
linux-2.6.36.2
packages: kernel-xenU/kernel-xenU-x86_64.config - updated for 2.6.36.2
Author: pawelz Date: Tue Dec 14 01:34:43 2010 GMT Module: packages Tag: HEAD Log message: - updated for 2.6.36.2 Files affected: packages/kernel-xenU: kernel-xenU-x86_64.config (1.9 - 1.10) Diffs: Index: packages/kernel-xenU/kernel-xenU-x86_64.config diff -u packages/kernel-xenU/kernel-xenU-x86_64.config:1.9 packages/kernel-xenU/kernel-xenU-x86_64.config:1.10 --- packages/kernel-xenU/kernel-xenU-x86_64.config:1.9 Wed Sep 22 12:29:03 2010 +++ packages/kernel-xenU/kernel-xenU-x86_64.config Tue Dec 14 02:34:38 2010 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35.5 -# Wed Sep 22 10:42:42 2010 +# Linux kernel version: 2.6.36.2-xenU +# Tue Dec 14 03:15:12 2010 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -10,7 +10,6 @@ CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT=elf64-x86-64 CONFIG_ARCH_DEFCONFIG=arch/x86/configs/x86_64_defconfig -CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -91,14 +90,13 @@ CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y # # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 # CONFIG_RCU_FANOUT_EXACT is not set @@ -172,7 +170,6 @@ # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -# CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y @@ -189,13 +186,12 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y # # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set -CONFIG_SLOW_WORK=y -# CONFIG_SLOW_WORK_DEBUG is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -220,7 +216,6 @@ CONFIG_IOSCHED_CFQ=m # CONFIG_CFQ_GROUP_IOSCHED is not set CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED=deadline CONFIG_PADATA=y @@ -268,6 +263,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_XEN=y +CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=32 # CONFIG_XEN_DEBUG_FS is not set # CONFIG_KVM_CLOCK is not set @@ -278,28 +274,7 @@ # CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set # CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set @@ -349,8 +324,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -# CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_NEED_MULTIPLE_NODES=y @@ -495,13 +468,7 @@ # CONFIG_TCP_CONG_VENO is not set # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_CONG_ILLINOIS is not set -# CONFIG_DEFAULT_BIC is not set CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_HYBLA is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_VENO is not set -# CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG=cubic CONFIG_TCP_MD5SIG=y @@ -528,6 +495,7 @@ CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set CONFIG_NETWORK_SECMARK=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y @@ -540,7 +508,6 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y @@ -571,12 +538,14 @@ # # Xtables targets # +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -598,6 +567,7
packages: kernel-xenU/kernel-xenU-x86.config - updated for 2.6.36.2 - not t...
Author: pawelz Date: Tue Dec 14 01:35:02 2010 GMT Module: packages Tag: HEAD Log message: - updated for 2.6.36.2 - not tested Files affected: packages/kernel-xenU: kernel-xenU-x86.config (1.4 - 1.5) Diffs: Index: packages/kernel-xenU/kernel-xenU-x86.config diff -u packages/kernel-xenU/kernel-xenU-x86.config:1.4 packages/kernel-xenU/kernel-xenU-x86.config:1.5 --- packages/kernel-xenU/kernel-xenU-x86.config:1.4 Sat Oct 2 17:53:58 2010 +++ packages/kernel-xenU/kernel-xenU-x86.config Tue Dec 14 02:34:57 2010 @@ -10,7 +10,6 @@ CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT=elf32-i386 CONFIG_ARCH_DEFCONFIG=arch/x86/configs/i386_defconfig -CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -92,14 +91,13 @@ CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y # # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set @@ -173,7 +171,6 @@ # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -# CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y @@ -195,8 +192,6 @@ # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set -CONFIG_SLOW_WORK=y -# CONFIG_SLOW_WORK_DEBUG is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -221,7 +216,6 @@ CONFIG_IOSCHED_CFQ=m # CONFIG_CFQ_GROUP_IOSCHED is not set CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED=deadline CONFIG_PADATA=y @@ -273,6 +267,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_XEN=y +CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=32 # CONFIG_XEN_DEBUG_FS is not set # CONFIG_VMI is not set @@ -285,28 +280,7 @@ # CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set CONFIG_MK8=y -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set @@ -367,8 +341,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -# CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y @@ -498,13 +470,7 @@ # CONFIG_TCP_CONG_VENO is not set # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_CONG_ILLINOIS is not set -# CONFIG_DEFAULT_BIC is not set CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_HYBLA is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_VENO is not set -# CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG=cubic CONFIG_TCP_MD5SIG=y @@ -531,6 +497,7 @@ CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set CONFIG_NETWORK_SECMARK=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y @@ -543,7 +510,6 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y @@ -574,12 +540,14 @@ # # Xtables targets # +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -601,6 +569,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m @@ -608,6 +577,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m
packages: kernel-xenU/kernel-xenU.spec - up to 2.6.36.2 - please, test i686
Author: pawelz Date: Tue Dec 14 01:35:38 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 2.6.36.2
- please, test i686
Files affected:
packages/kernel-xenU:
kernel-xenU.spec (1.54 - 1.55)
Diffs:
Index: packages/kernel-xenU/kernel-xenU.spec
diff -u packages/kernel-xenU/kernel-xenU.spec:1.54
packages/kernel-xenU/kernel-xenU.spec:1.55
--- packages/kernel-xenU/kernel-xenU.spec:1.54 Mon Nov 8 14:56:39 2010
+++ packages/kernel-xenU/kernel-xenU.spec Tue Dec 14 02:35:33 2010
@@ -14,8 +14,8 @@
%{?debug:%define with_verbose 1}
-%define_basever2.6.35
-%define_postver.8
+%define_basever2.6.36
+%define_postver.2
%define_rel1
%define_enable_debug_packages 0
@@ -40,10 +40,10 @@
License: GPL v2
Group: Base/Kernel
Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5: 091abeb4684ce03d1d936851618687b6
+# Source0-md5: 61f3739a73afb6914cb007f37fb09b62
%if %{_postver} != %{nil}
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 198e4e72ea9cc7f9f25bb5881167aa2e
+# Source1-md5: 4b01c5f9657a9587b262df5f8d784116
%endif
Source2: kernel-xenU-autoconf.h
@@ -665,6 +665,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.55 2010/12/14 01:35:33 pawelz
+- up to 2.6.36.2
+- please, test i686
+
Revision 1.54 2010/11/08 13:56:39 pawelz
- some cleanup
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/kernel-xenU.spec?r1=1.54r2=1.55f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel-xenU/kernel-xenU.spec - rel down to 0.1 (i686 does not bui...
Author: pawelz Date: Tue Dec 14 01:51:23 2010 GMT Module: packages Tag: HEAD Log message: - rel down to 0.1 (i686 does not build. I'll investigate it tomorow). Files affected: packages/kernel-xenU: kernel-xenU.spec (1.55 - 1.56) Diffs: Index: packages/kernel-xenU/kernel-xenU.spec diff -u packages/kernel-xenU/kernel-xenU.spec:1.55 packages/kernel-xenU/kernel-xenU.spec:1.56 --- packages/kernel-xenU/kernel-xenU.spec:1.55 Tue Dec 14 02:35:33 2010 +++ packages/kernel-xenU/kernel-xenU.spec Tue Dec 14 02:51:18 2010 @@ -16,7 +16,7 @@ %define_basever2.6.36 %define_postver.2 -%define_rel1 +%define_rel0.1 %define_enable_debug_packages 0 @@ -665,6 +665,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.56 2010/12/14 01:51:18 pawelz +- rel down to 0.1 (i686 does not build. I'll investigate it tomorow). + Revision 1.55 2010/12/14 01:35:33 pawelz - up to 2.6.36.2 - please, test i686 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/kernel-xenU.spec?r1=1.55r2=1.56f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101210.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101210.tar.bz2 240c7203a2b8c15557710dcbc8fbf8c6 ekg2-20101210.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - added missing %dir - rel 2
Author: pawelz Date: Fri Dec 10 11:26:53 2010 GMT
Module: packages Tag: HEAD
Log message:
- added missing %dir
- rel 2
Files affected:
packages/ekg2:
ekg2.spec (1.138 - 1.139)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.138 packages/ekg2/ekg2.spec:1.139
--- packages/ekg2/ekg2.spec:1.138 Fri Dec 10 02:06:22 2010
+++ packages/ekg2/ekg2.spec Fri Dec 10 12:26:48 2010
@@ -28,7 +28,7 @@
%definesubver 20101210
%endif
-%definerel 1
+%definerel 2
%if %{with sqlite}
%undefine sqlite3
@@ -538,6 +538,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
%{_datadir}/%{name}/scripts/*.py
+%dir %{_datadir}/ekg2/plugins/python
%{_datadir}/ekg2/plugins/python/commands-en.txt
%{_datadir}/ekg2/plugins/python/commands-pl.txt
%endif
@@ -560,6 +561,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.139 2010/12/10 11:26:48 pawelz
+- added missing %dir
+- rel 2
+
Revision 1.138 2010/12/10 01:06:22 pawelz
- reenabled gtk (it works now!)
- up to 20101210
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.138r2=1.139f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - reenabled gtk (it works now!) - up to 20101210
Author: pawelz Date: Fri Dec 10 01:06:27 2010 GMT
Module: packages Tag: HEAD
Log message:
- reenabled gtk (it works now!)
- up to 20101210
Files affected:
packages/ekg2:
ekg2.spec (1.137 - 1.138)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.137 packages/ekg2/ekg2.spec:1.138
--- packages/ekg2/ekg2.spec:1.137 Sat Nov 27 23:57:05 2010
+++ packages/ekg2/ekg2.spec Fri Dec 10 02:06:22 2010
@@ -10,7 +10,7 @@
%bcond_without feed# don't build feed plugin
%bcond_without gadugadu# don't build gg plugin
%bcond_without gpg # don't build gpg plugin
-%bcond_withgtk # don't build gtk plugin
+%bcond_without gtk # don't build gtk plugin
%bcond_without jabber # don't build jabber plugin
%bcond_without gnutls # build jabber plugin without libgnutls
%bcond_without libgsm # don't build libgsm plugin
@@ -25,7 +25,7 @@
%if %{with git}
%definesubver git.%(date +%Y%m%d)
%else
-%definesubver 20101127
+%definesubver 20101210
%endif
%definerel 1
@@ -39,12 +39,12 @@
Name: ekg2
Version: 0.4
Release: 0.%{subver}.%{rel}
-Epoch: 2
+Epoch: 1
License: GPL v2+
Group: Applications/Communications
%if %{without git}
Source0:
https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
-# Source0-md5: baec7f1165c9f98745ff544e66e98f3d
+# Source0-md5: 240c7203a2b8c15557710dcbc8fbf8c6
%endif
Patch0:%{name}-perl-install.patch
Patch1:%{name}-gtk.patch
@@ -560,6 +560,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.138 2010/12/10 01:06:22 pawelz
+- reenabled gtk (it works now!)
+- up to 20101210
+
Revision 1.137 2010/11/27 22:57:05 pawelz
- ekg 0.3 is branched, so git/master is 0.4 now. (bump V:)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.137r2=1.138f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101210.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 1 STORED: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101210.tar.bz2 240c7203a2b8c15557710dcbc8fbf8c6 ekg2-20101210.tar.bz2 Size: 1247711 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jira/jira.spec - up to 4.2.1
Author: pawelz Date: Thu Dec 9 00:38:20 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 4.2.1
Files affected:
packages/jira:
jira.spec (1.53 - 1.54)
Diffs:
Index: packages/jira/jira.spec
diff -u packages/jira/jira.spec:1.53 packages/jira/jira.spec:1.54
--- packages/jira/jira.spec:1.53Mon Nov 22 14:01:46 2010
+++ packages/jira/jira.spec Thu Dec 9 01:38:15 2010
@@ -14,11 +14,11 @@
# See Atlassian_EULA_3.0.pdf for more details.
# RELEASE INFO:
-# This version of jira was released on the 27st October 2010
+# This version of jira was released on the 30th November 2010
%if 0
# Download sources manually:
-wget -c
http://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.tar.gz
+wget -c
http://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.1-b588.tar.gz
wget -c http://www.atlassian.com/about/licensing/Atlassian_EULA_3.0.pdf
wget -c
http://www.atlassian.com/software/jira/docs/servers/jars/v1/jira-jars-tomcat5.zip
%endif
@@ -27,12 +27,12 @@
Summary: JIRA issue tracker and project management tool
Name: jira
-Version: 4.2
+Version: 4.2.1
Release: 1
License: Proprietary, not distributable
Group: Networking/Daemons/Java/Servlets
-Source0: atlassian-%{name}-enterprise-%{version}.tar.gz
-# NoSource0-md5: 7339acae1606fdfb1ff711f03a752f0e
+Source0: atlassian-%{name}-enterprise-%{version}-b588.tar.gz
+# NoSource0-md5: 95f3cd5c64ef81de9b2fdd233f4b1823
NoSource: 0
Source1: Atlassian_EULA_3.0.pdf
# NoSource1-md5: 9e87088024e3c5ee2e63a72a3e99a6cb
@@ -66,7 +66,7 @@
you can customise to match to your business processes.
%prep
-%setup -q -n atlassian-%{name}-enterprise-%{version} -a2
+%setup -q -n atlassian-%{name}-enterprise-%{version}-b588 -a2
cp %{SOURCE1} .
@@ -140,6 +140,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.54 2010/12/09 00:38:15 pawelz
+- up to 4.2.1
+
Revision 1.53 2010/11/22 13:01:46 pawelz
- %config(missingok) /etc/tomcat/.../jira.xml (don't recreate it if user
removed/renamed this file). Not tested. Thx janekr.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira/jira.spec?r1=1.53r2=1.54f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: confluence/confluence.spec - up to 3.4.3
Author: pawelz Date: Thu Dec 9 00:44:39 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 3.4.3
Files affected:
packages/confluence:
confluence.spec (1.25 - 1.26)
Diffs:
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.25
packages/confluence/confluence.spec:1.26
--- packages/confluence/confluence.spec:1.25Mon Sep 27 20:25:00 2010
+++ packages/confluence/confluence.spec Thu Dec 9 01:44:34 2010
@@ -32,12 +32,12 @@
%include /usr/lib/rpm/macros.java
Summary: Confluence - Enterprise wiki
Name: confluence
-Version: 3.3.3
+Version: 3.4.3
Release: 1
License: Proprietary, not distributable
Group: Networking/Daemons/Java/Servlets
Source0: %{name}-%{version}.tar.gz
-# NoSource0-md5: ba77782c1ed268df57a6158b01344932
+# NoSource0-md5: 3ed77fbdc17c0cee41795d4fff7fa27b
NoSource: 0
Source1: %{name}-context.xml
Source2: %{name}-init.properties
@@ -185,6 +185,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.26 2010/12/09 00:44:34 pawelz
+- up to 3.4.3
+
Revision 1.25 2010/09/27 18:25:00 pawelz
- polish my english
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.25r2=1.26f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: confluence/confluence.spec - %config(missingok) context config.
Author: pawelz Date: Thu Dec 9 00:46:26 2010 GMT
Module: packages Tag: HEAD
Log message:
- %config(missingok) context config.
Files affected:
packages/confluence:
confluence.spec (1.26 - 1.27)
Diffs:
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.26
packages/confluence/confluence.spec:1.27
--- packages/confluence/confluence.spec:1.26Thu Dec 9 01:44:34 2010
+++ packages/confluence/confluence.spec Thu Dec 9 01:46:21 2010
@@ -171,7 +171,7 @@
%{_datadir}/confluence
%exclude %{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
-%{_tomcatconfdir}/%{name}.xml
+%config(missingok) %{_tomcatconfdir}/%{name}.xml
%attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
%attr(2775,root,servlet) %dir /var/log/confluence
@@ -185,6 +185,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.27 2010/12/09 00:46:21 pawelz
+- %config(missingok) context config.
+
Revision 1.26 2010/12/09 00:44:34 pawelz
- up to 3.4.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.26r2=1.27f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jira/jira.spec - use %_tomcatconfdir macro.
Author: pawelz Date: Thu Dec 9 00:49:09 2010 GMT
Module: packages Tag: HEAD
Log message:
- use %_tomcatconfdir macro.
Files affected:
packages/jira:
jira.spec (1.54 - 1.55)
Diffs:
Index: packages/jira/jira.spec
diff -u packages/jira/jira.spec:1.54 packages/jira/jira.spec:1.55
--- packages/jira/jira.spec:1.54Thu Dec 9 01:38:15 2010
+++ packages/jira/jira.spec Thu Dec 9 01:49:04 2010
@@ -88,9 +88,9 @@
cp -a tmp/build/war/* $RPM_BUILD_ROOT%{_datadir}/jira
# configuration
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/jira,%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jira,%{_tomcatconfdir}}
install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/jira/tomcat-context.xml
-ln -s %{_sysconfdir}/jira/tomcat-context.xml
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
+ln -s %{_sysconfdir}/jira/tomcat-context.xml
$RPM_BUILD_ROOT%{_tomcatconfdir}/jira.xml
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/jira-application.properties
$RPM_BUILD_ROOT%{_sysconfdir}/jira/jira-application.properties
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/log4j.properties
$RPM_BUILD_ROOT%{_sysconfdir}/jira/log4j.properties
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/entityengine.xml
$RPM_BUILD_ROOT%{_sysconfdir}/jira/entityengine.xml
@@ -123,7 +123,7 @@
%{_datadir}/jira
%dir %attr(750,root,tomcat) %{_sysconfdir}/jira
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,tomcat)
%{_sysconfdir}/jira/*
-%config(missingok) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
+%config(missingok) %{_tomcatconfdir}/jira.xml
%{_datadir}/tomcat/lib/*jar
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/jiradb
@@ -140,6 +140,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.55 2010/12/09 00:49:04 pawelz
+- use %_tomcatconfdir macro.
+
Revision 1.54 2010/12/09 00:38:15 pawelz
- up to 4.2.1
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira/jira.spec?r1=1.54r2=1.55f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
template-specs: java-webapp.spec - %config(missingok) context config.
Author: pawelz Date: Thu Dec 9 00:49:47 2010 GMT
Module: template-specsTag: HEAD
Log message:
- %config(missingok) context config.
Files affected:
template-specs:
java-webapp.spec (1.2 - 1.3)
Diffs:
Index: template-specs/java-webapp.spec
diff -u template-specs/java-webapp.spec:1.2 template-specs/java-webapp.spec:1.3
--- template-specs/java-webapp.spec:1.2 Tue Mar 30 08:53:34 2010
+++ template-specs/java-webapp.spec Thu Dec 9 01:49:42 2010
@@ -82,7 +82,7 @@
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/*.properties
-%{_tomcatconfdir}/%{name}.xml
+%config(missingok) %{_tomcatconfdir}/%{name}.xml
%{webappdir}
%attr(2775,root,servlet) %dir %{_sharedstatedir}/%{name}
%dir %attr(2770,root,servlet) %{logdir}
@@ -93,6 +93,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2010/12/09 00:49:42 pawelz
+- %config(missingok) context config.
+
Revision 1.2 2010/03/30 06:53:34 pawelz
- suggest more verbose %files, don't use %config for directories
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/java-webapp.spec?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: gitolite/lib.patch - fix all perl files.
Author: pawelz Date: Thu Dec 2 14:47:25 2010 GMT
Module: packages Tag: HEAD
Log message:
- fix all perl files.
Files affected:
packages/gitolite:
lib.patch (1.4 - 1.5)
Diffs:
Index: packages/gitolite/lib.patch
diff -u packages/gitolite/lib.patch:1.4 packages/gitolite/lib.patch:1.5
--- packages/gitolite/lib.patch:1.4 Wed Dec 1 15:53:21 2010
+++ packages/gitolite/lib.patch Thu Dec 2 15:47:20 2010
@@ -1,15 +1,35 @@
gitolite-1.5.7/src/gl-install~ 2010-11-06 14:23:01.0 +0100
-+++ gitolite-1.5.7/src/gl-install 2010-12-01 15:49:15.0 +0100
-@@ -29,6 +29,7 @@
- my $bindir = $0;
+--- gitolite-1.5.7/contrib/adc/gl-reflog.old 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/contrib/adc/gl-reflog 2010-12-02 15:39:56.0
+0100
+@@ -41,6 +41,7 @@
+ $limit ||= 10;
+
+ unshift @INC, $ENV{GL_BINDIR};
++use lib /usr/share/gitolite/lib;
+ require gitolite or die parse gitolite.pm failed\n;
+
+ my ($perm, $creator, $wild) = repo_rights($repo);
+--- gitolite-1.5.7/hooks/common/update.old 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/hooks/common/update 2010-12-02 15:39:56.0 +0100
+@@ -36,6 +36,7 @@
+ die parse $ENV{GL_RC} failed:. ($! or $@) unless do $ENV{GL_RC};
+
+ unshift @INC, $ENV{GL_BINDIR};
++use lib /usr/share/gitolite/lib;
+ require gitolite or die parse gitolite.pm failed\n;
+
+ my ($perm, $creator, $wild) = repo_rights($ENV{GL_REPO});
+--- gitolite-1.5.7/src/gl-auth-command.old 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/src/gl-auth-command 2010-12-02 15:39:56.0 +0100
+@@ -44,6 +44,7 @@
$bindir =~ s/\/[^\/]+$//;
+ $bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
unshift @INC, $bindir;
+use lib /usr/share/gitolite/lib;
require gitolite or die parse gitolite.pm failed\n;
# ask where the rc file is, get it, and do it
gitolite-1.5.7/src/gl-compile-conf~2010-11-06 14:23:01.0
+0100
-+++ gitolite-1.5.7/src/gl-compile-conf 2010-12-01 15:49:47.0 +0100
+--- gitolite-1.5.7/src/gl-compile-conf.old 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/src/gl-compile-conf 2010-12-02 15:39:56.0 +0100
@@ -61,6 +61,7 @@
$bindir =~ s/\/[^\/]+$//;
$bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
@@ -18,8 +38,18 @@
require gitolite or die parse gitolite.pm failed\n;
# ask where the rc file is, get it, and do it
gitolite-1.5.7/src/gl-setup-authkeys~ 2010-11-06 14:23:01.0
+0100
-+++ gitolite-1.5.7/src/gl-setup-authkeys 2010-12-01 15:49:57.0
+0100
+--- gitolite-1.5.7/src/gl-install.old 2010-11-06 14:23:01.0 +0100
gitolite-1.5.7/src/gl-install 2010-12-02 15:39:56.0 +0100
+@@ -29,6 +29,7 @@
+ my $bindir = $0;
+ $bindir =~ s/\/[^\/]+$//;
+ unshift @INC, $bindir;
++use lib /usr/share/gitolite/lib;
+ require gitolite or die parse gitolite.pm failed\n;
+
+ # ask where the rc file is, get it, and do it
+--- gitolite-1.5.7/src/gl-setup-authkeys.old 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/src/gl-setup-authkeys 2010-12-02 15:39:56.0
+0100
@@ -31,6 +31,7 @@
$bindir =~ s/\/[^\/]+$//;
$bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
@@ -28,8 +58,8 @@
require gitolite or die parse gitolite.pm failed\n;
# prevent newbie from running it accidentally and clobbering his authkeys
gitolite-1.5.7/src/gl-time~2010-11-06 14:23:01.0 +0100
-+++ gitolite-1.5.7/src/gl-time 2010-12-01 15:50:05.0 +0100
+--- gitolite-1.5.7/src/gl-time.old 2010-11-06 14:23:01.0 +0100
gitolite-1.5.7/src/gl-time 2010-12-02 15:39:56.0 +0100
@@ -23,6 +23,7 @@
$bindir =~ s/\/[^\/]+$//;
$bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/lib.patch?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: gitolite/gitolite.spec - script for upgrading lib.patch - rel 2 (...
Author: pawelz Date: Thu Dec 2 14:47:57 2010 GMT
Module: packages Tag: HEAD
Log message:
- script for upgrading lib.patch
- rel 2 (because of fixed patch)
Files affected:
packages/gitolite:
gitolite.spec (1.13 - 1.14)
Diffs:
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.13
packages/gitolite/gitolite.spec:1.14
--- packages/gitolite/gitolite.spec:1.13Wed Dec 1 15:53:30 2010
+++ packages/gitolite/gitolite.spec Thu Dec 2 15:47:52 2010
@@ -6,11 +6,14 @@
Summary(pl.UTF-8): Narzędzie do hostowania repozytoriów git
Name: gitolite
Version: 1.5.7
-Release: 1
+Release: 2
License: GPL v2
Group: Development/Tools
Source0:
http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 4a7604902b35ad246b95fc8c99d59b8c
+# Use the following script to update Patch0:
+# for I in $(ack 'require gitolite' gitolite-1.5.7/ | cut -d: -f1 | sort |
uniq ); do mv $I $I.old; sed $I.old $I '/require gitolite/iuse lib
/usr/share/gitolite/lib;'; done
+# for I in $(ack 'require gitolite' gitolite-1.5.7/ | cut -d: -f1 | sort |
uniq | grep -v old); do diff -u $I.old $I; done
Patch0:lib.patch
URL: http://github.com/sitaramc/gitolite
BuildRequires: rpm-perlprov
@@ -96,6 +99,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.14 2010/12/02 14:47:52 pawelz
+- script for upgrading lib.patch
+- rel 2 (because of fixed patch)
+
Revision 1.13 2010/12/01 14:53:30 pawelz
- up to 1.5.7
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.13r2=1.14f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: aspell/aspell.spec - rel 5
Author: pawelz Date: Wed Dec 1 13:33:14 2010 GMT Module: packages Tag: HEAD Log message: - rel 5 Files affected: packages/aspell: aspell.spec (1.95 - 1.96) Diffs: Index: packages/aspell/aspell.spec diff -u packages/aspell/aspell.spec:1.95 packages/aspell/aspell.spec:1.96 --- packages/aspell/aspell.spec:1.95Tue Nov 30 12:23:08 2010 +++ packages/aspell/aspell.spec Wed Dec 1 14:33:08 2010 @@ -4,7 +4,7 @@ Summary(pt_BR.UTF-8): Verificador ortográfico Name: aspell Version: 0.60.6 -Release: 4.1 +Release: 5 Epoch: 3 License: LGPL v2 or v2.1 Group: Applications/Text @@ -202,6 +202,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.96 2010/12/01 13:33:08 pawelz +- rel 5 + Revision 1.95 2010/11/30 11:23:08 pawelz - apply ac.patch (fix linking against ncurses) - rel 4.1 (does not build, please help) CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aspell/aspell.spec?r1=1.95r2=1.96f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: gitolite/lib.patch - updated for gitolite 1.5.7
Author: pawelz Date: Wed Dec 1 14:53:26 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated for gitolite 1.5.7
Files affected:
packages/gitolite:
lib.patch (1.3 - 1.4)
Diffs:
Index: packages/gitolite/lib.patch
diff -u packages/gitolite/lib.patch:1.3 packages/gitolite/lib.patch:1.4
--- packages/gitolite/lib.patch:1.3 Mon Jun 7 16:03:18 2010
+++ packages/gitolite/lib.patch Wed Dec 1 15:53:21 2010
@@ -1,48 +1,40 @@
gitolite-1.5.1/src/gl-install~ 2010-06-02 08:59:47.0 +0200
-+++ gitolite-1.5.1/src/gl-install 2010-06-07 14:51:51.0 +0200
-@@ -26,7 +26,8 @@
- # the common setup module is in the same directory as this running program is
+--- gitolite-1.5.7/src/gl-install~ 2010-11-06 14:23:01.0 +0100
gitolite-1.5.7/src/gl-install 2010-12-01 15:49:15.0 +0100
+@@ -29,6 +29,7 @@
my $bindir = $0;
$bindir =~ s/\/[^\/]+$//;
--require $bindir/gitolite.pm;
+ unshift @INC, $bindir;
+use lib /usr/share/gitolite/lib;
-+require gitolite;
+ require gitolite or die parse gitolite.pm failed\n;
# ask where the rc file is, get it, and do it
- where_is_rc();
gitolite-1.5.1/src/gl-auth-command~2010-06-02 08:59:47.0
+0200
-+++ gitolite-1.5.1/src/gl-auth-command 2010-06-07 14:53:08.0 +0200
-@@ -33,7 +33,8 @@
- my $bindir = $0;
+--- gitolite-1.5.7/src/gl-compile-conf~2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/src/gl-compile-conf 2010-12-01 15:49:47.0 +0100
+@@ -61,6 +61,7 @@
$bindir =~ s/\/[^\/]+$//;
$bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
--require $bindir/gitolite.pm;
+ unshift @INC, $bindir;
+use lib /usr/share/gitolite/lib;
-+require gitolite;
+ require gitolite or die parse gitolite.pm failed\n;
# ask where the rc file is, get it, and do it
- where_is_rc();
gitolite-1.5.1/src/gl-compile-conf~2010-06-02 08:59:47.0
+0200
-+++ gitolite-1.5.1/src/gl-compile-conf 2010-06-07 14:53:30.0 +0200
-@@ -60,7 +60,8 @@
- my $bindir = $0;
+--- gitolite-1.5.7/src/gl-setup-authkeys~ 2010-11-06 14:23:01.0
+0100
gitolite-1.5.7/src/gl-setup-authkeys 2010-12-01 15:49:57.0
+0100
+@@ -31,6 +31,7 @@
$bindir =~ s/\/[^\/]+$//;
$bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
--require $bindir/gitolite.pm;
+ unshift @INC, $bindir;
+use lib /usr/share/gitolite/lib;
-+require gitolite;
-
- # ask where the rc file is, get it, and do it
- where_is_rc();
gitolite-1.5.1/hooks/common/update~2010-06-02 08:59:47.0
+0200
-+++ gitolite-1.5.1/hooks/common/update 2010-06-07 16:00:47.0 +0200
-@@ -35,7 +35,8 @@
- # we should already have the GL_RC env var set when we enter this hook
- die parse $ENV{GL_RC} failed:. ($! or $@) unless do $ENV{GL_RC};
+ require gitolite or die parse gitolite.pm failed\n;
--require $ENV{GL_BINDIR}/gitolite.pm;
+ # prevent newbie from running it accidentally and clobbering his authkeys
+--- gitolite-1.5.7/src/gl-time~2010-11-06 14:23:01.0 +0100
gitolite-1.5.7/src/gl-time 2010-12-01 15:50:05.0 +0100
+@@ -23,6 +23,7 @@
+ $bindir =~ s/\/[^\/]+$//;
+ $bindir = $ENV{PWD}/$bindir unless $bindir =~ /^\//;
+ unshift @INC, $bindir;
+use lib /usr/share/gitolite/lib;
-+require gitolite;
+ require gitolite or die parse gitolite.pm failed\n;
- my ($perm, $creator, $wild) = repo_rights($ENV{GL_REPO});
- my $reported_repo = $ENV{GL_REPO} . ( $ENV{GL_REPOPATT} ?
($ENV{GL_REPOPATT}) : );
+ # ---
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/lib.patch?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gitolite: gitolite-1.5.7.tar.gz
Files fetched: 1 STORED: http://github.com/sitaramc/gitolite/tarball/v1.5.7/gitolite-1.5.7.tar.gz 4a7604902b35ad246b95fc8c99d59b8c gitolite-1.5.7.tar.gz Size: 163757 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: gitolite/gitolite.spec - up to 1.5.7
Author: pawelz Date: Wed Dec 1 14:53:35 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.5.7
Files affected:
packages/gitolite:
gitolite.spec (1.12 - 1.13)
Diffs:
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.12
packages/gitolite/gitolite.spec:1.13
--- packages/gitolite/gitolite.spec:1.12Tue Jun 8 23:11:03 2010
+++ packages/gitolite/gitolite.spec Wed Dec 1 15:53:30 2010
@@ -5,12 +5,12 @@
Summary: Software for hosting git repositories
Summary(pl.UTF-8): Narzędzie do hostowania repozytoriów git
Name: gitolite
-Version: 1.5.1
+Version: 1.5.7
Release: 1
License: GPL v2
Group: Development/Tools
Source0:
http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bb5f1ed88cbf96ca5d4fbda2adf5ed3f
+# Source0-md5: 4a7604902b35ad246b95fc8c99d59b8c
Patch0:lib.patch
URL: http://github.com/sitaramc/gitolite
BuildRequires: rpm-perlprov
@@ -96,6 +96,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.13 2010/12/01 14:53:30 pawelz
+- up to 1.5.7
+
Revision 1.12 2010/06/08 21:11:03 pawelz
- dropped R: htpasswd. It is for additional, optional functionality.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.12r2=1.13f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat.spec - up to 7.0.5 (still beta)
Author: pawelz Date: Wed Dec 1 19:52:21 2010 GMT
Module: packages Tag: DEVEL
Log message:
- up to 7.0.5 (still beta)
Files affected:
packages/tomcat:
tomcat.spec (1.172.2.20 - 1.172.2.21)
Diffs:
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.20
packages/tomcat/tomcat.spec:1.172.2.21
--- packages/tomcat/tomcat.spec:1.172.2.20 Fri Oct 22 16:29:13 2010
+++ packages/tomcat/tomcat.spec Wed Dec 1 20:52:16 2010
@@ -15,12 +15,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet
%{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową
implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 7.0.4
+Version: 7.0.5
Release: 1.%{subver}.%{rel}
License: Apache v2.0
Group: Networking/Daemons/Java
Source0:
http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v%{version}%{?subver:-%subver}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: a56eae890fd0b00667a9cf2988004035
+# Source0-md5: 8fec5203e6b7920f6b18a41149910629
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -528,6 +528,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.172.2.21 2010/12/01 19:52:16 pawelz
+- up to 7.0.5 (still beta)
+
Revision 1.172.2.20 2010/10/22 14:29:13 pawelz
- up to 7.0.4
- rel 0.1 (build.xml patch needs to be updated)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.20r2=1.172.2.21f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: ERRORS: commons-logging-1.1.1-src.tar.gz
tomcat.spec: undefined macro ?subver:-%subver Files fetched: 0 ALREADY GOT: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: ERRORS: commons-logging-1.1.1-src.tar.gz
tomcat.spec: undefined macro ?subver:-%subver Files fetched: 0 ALREADY GOT: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat.spec - TODO: merge baggins' improvements fr...
Author: pawelz Date: Wed Dec 1 19:55:03 2010 GMT Module: packages Tag: DEVEL Log message: - TODO: merge baggins' improvements from HEAD Files affected: packages/tomcat: tomcat.spec (1.172.2.21 - 1.172.2.22) Diffs: Index: packages/tomcat/tomcat.spec diff -u packages/tomcat/tomcat.spec:1.172.2.21 packages/tomcat/tomcat.spec:1.172.2.22 --- packages/tomcat/tomcat.spec:1.172.2.21 Wed Dec 1 20:52:16 2010 +++ packages/tomcat/tomcat.spec Wed Dec 1 20:54:58 2010 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO: +# - merge baggins' improvements from HEAD # Conditional build: %bcond_without javadoc # skip building javadocs @@ -528,6 +530,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.172.2.22 2010/12/01 19:54:58 pawelz +- TODO: merge baggins' improvements from HEAD + Revision 1.172.2.21 2010/12/01 19:52:16 pawelz - up to 7.0.5 (still beta) CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.21r2=1.172.2.22f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: tomcat: ERRORS: apache-tomcat-7.0.5-src.tar.gz commons-logging-1.1.1-src.tar.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/29746369-dcdd-45e8-abbe-1bfb47a38d76/8fec5203e6b7920f6b18a41149910629/apache-tomcat-7.0.5-src.tar.gz http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz: http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz: 2010-12-01 21:21:48 ERROR 404: Not Found. wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/29746369-dcdd-45e8-abbe-1bfb47a38d76/8fec5203e6b7920f6b18a41149910629/apache-tomcat-7.0.5-src.tar.gz http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz: exited with code 8 (0x00) FATAL: http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz (8fec5203e6b7920f6b18a41149910629) was not fetched (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/29746369-dcdd-45e8-abbe-1bfb47a38d76/8fec5203e6b7920f6b18a41149910629/apache-tomcat-7.0.5-src.tar.gz http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz: http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v7.0.5beta/src/apache-tomcat-7.0.5-src.tar.gz: 2010-12-01 21:21:48 ERROR 404: Not Found. ): file exists but has 0 length Files fetched: 0 ALREADY GOT: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): tomcat/tomcat.spec - DF does not understand things like %...
Author: pawelz Date: Wed Dec 1 20:21:51 2010 GMT
Module: packages Tag: DEVEL
Log message:
- DF does not understand things like %{?subver:-%subver}
Files affected:
packages/tomcat:
tomcat.spec (1.172.2.22 - 1.172.2.23)
Diffs:
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.22
packages/tomcat/tomcat.spec:1.172.2.23
--- packages/tomcat/tomcat.spec:1.172.2.22 Wed Dec 1 20:54:58 2010
+++ packages/tomcat/tomcat.spec Wed Dec 1 21:21:46 2010
@@ -21,7 +21,7 @@
Release: 1.%{subver}.%{rel}
License: Apache v2.0
Group: Networking/Daemons/Java
-Source0:
http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v%{version}%{?subver:-%subver}/src/apache-%{name}-%{version}-src.tar.gz
+Source0:
http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v%{version}%{subver}/src/apache-%{name}-%{version}-src.tar.gz
# Source0-md5: 8fec5203e6b7920f6b18a41149910629
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
@@ -530,6 +530,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.172.2.23 2010/12/01 20:21:46 pawelz
+- DF does not understand things like %{?subver:-%subver}
+
Revision 1.172.2.22 2010/12/01 19:54:58 pawelz
- TODO: merge baggins' improvements from HEAD
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.22r2=1.172.2.23f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: aspell/aspell-ac.patch (NEW) - fix linking (thx SamChi) - Note: i...
Author: pawelz Date: Tue Nov 30 11:22:40 2010 GMT Module: packages Tag: HEAD Log message: - fix linking (thx SamChi) - Note: it does not work. Files affected: packages/aspell: aspell-ac.patch (NONE - 1.1) (NEW) Diffs: Index: packages/aspell/aspell-ac.patch diff -u /dev/null packages/aspell/aspell-ac.patch:1.1 --- /dev/null Tue Nov 30 12:22:40 2010 +++ packages/aspell/aspell-ac.patch Tue Nov 30 12:22:35 2010 @@ -0,0 +1,15 @@ +--- aspell-0.60.6/configure.ac~2008-04-07 05:50:05.0 +0200 aspell-0.60.6/configure.ac 2010-11-30 11:36:09.0 +0100 +@@ -343,10 +343,10 @@ + + if test $enable_wide_curses != no -a -n $have_mblen + then +- LIBS=-lncursesw $ORIG_LIBS ++ LIBS=-lncursesw -tinfow $ORIG_LIBS + AC_TRY_LINK( + [#include ncursesw/curses.h], [initscr()], +-[CURSES_LIB=-lncursesw ++[CURSES_LIB=-lncursesw -tinfow + AC_DEFINE(CURSES_HEADER, ncursesw/curses.h, [Defined to curses header file])]) + fi + ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: aspell/aspell.spec - apply ac.patch (fix linking against ncurses)...
Author: pawelz Date: Tue Nov 30 11:23:13 2010 GMT
Module: packages Tag: HEAD
Log message:
- apply ac.patch (fix linking against ncurses)
- rel 4.1 (does not build, please help)
Files affected:
packages/aspell:
aspell.spec (1.94 - 1.95)
Diffs:
Index: packages/aspell/aspell.spec
diff -u packages/aspell/aspell.spec:1.94 packages/aspell/aspell.spec:1.95
--- packages/aspell/aspell.spec:1.94Tue Nov 30 01:43:31 2010
+++ packages/aspell/aspell.spec Tue Nov 30 12:23:08 2010
@@ -4,7 +4,7 @@
Summary(pt_BR.UTF-8): Verificador ortográfico
Name: aspell
Version: 0.60.6
-Release: 4
+Release: 4.1
Epoch: 3
License: LGPL v2 or v2.1
Group: Applications/Text
@@ -13,10 +13,12 @@
Patch0:%{name}-info.patch
# Patch1: %{name}-home_etc.patch
Patch2:%{name}-mk-static-filter.pl.patch
+Patch3:%{name}-ac.patch
URL: http://aspell.net/
BuildRequires: autoconf = 2.50
BuildRequires: automake
BuildRequires: gettext-devel = 0.16.1
+BuildRequires: ncurses-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool = 2:1.5
BuildRequires: texinfo
@@ -116,6 +118,7 @@
# Disabled until someone fixes it.
#%%patch1 -p1
%patch2 -p0
+%patch3 -p1
%build
%{__gettextize}
@@ -199,6 +202,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.95 2010/11/30 11:23:08 pawelz
+- apply ac.patch (fix linking against ncurses)
+- rel 4.1 (does not build, please help)
+
Revision 1.94 2010/11/30 00:43:31 pawelz
- home_etc patch is fubar. If HOME_ETC var is not defined, it tries to open
such files:
- open($HOME|.//.aspell.conf, O_RDONLY) = -1 ENOENT (No such file or
directory)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aspell/aspell.spec?r1=1.94r2=1.95f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: aspell/aspell-ac.patch - typo, still does not work.
Author: pawelz Date: Tue Nov 30 11:28:54 2010 GMT Module: packages Tag: HEAD Log message: - typo, still does not work. Files affected: packages/aspell: aspell-ac.patch (1.1 - 1.2) Diffs: Index: packages/aspell/aspell-ac.patch diff -u packages/aspell/aspell-ac.patch:1.1 packages/aspell/aspell-ac.patch:1.2 --- packages/aspell/aspell-ac.patch:1.1 Tue Nov 30 12:22:35 2010 +++ packages/aspell/aspell-ac.patch Tue Nov 30 12:28:49 2010 @@ -5,11 +5,11 @@ if test $enable_wide_curses != no -a -n $have_mblen then - LIBS=-lncursesw $ORIG_LIBS -+ LIBS=-lncursesw -tinfow $ORIG_LIBS ++ LIBS=-lncursesw -ltinfow $ORIG_LIBS AC_TRY_LINK( [#include ncursesw/curses.h], [initscr()], -[CURSES_LIB=-lncursesw -+[CURSES_LIB=-lncursesw -tinfow ++[CURSES_LIB=-lncursesw -ltinfow AC_DEFINE(CURSES_HEADER, ncursesw/curses.h, [Defined to curses header file])]) fi CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aspell/aspell-ac.patch?r1=1.1r2=1.2f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: aspell/aspell.spec - home_etc patch is fubar. If HOME_ETC var is ...
Author: pawelz Date: Tue Nov 30 00:43:36 2010 GMT
Module: packages Tag: HEAD
Log message:
- home_etc patch is fubar. If HOME_ETC var is not defined, it tries to open
such files:
- open($HOME|.//.aspell.conf, O_RDONLY) = -1 ENOENT (No such file or
directory)
- Disabled until someone fixes it.
- and once again: why are we maintaining home_etc instead of xdg dirs???
- rel 4
Files affected:
packages/aspell:
aspell.spec (1.93 - 1.94)
Diffs:
Index: packages/aspell/aspell.spec
diff -u packages/aspell/aspell.spec:1.93 packages/aspell/aspell.spec:1.94
--- packages/aspell/aspell.spec:1.93Wed Feb 18 21:11:01 2009
+++ packages/aspell/aspell.spec Tue Nov 30 01:43:31 2010
@@ -4,14 +4,14 @@
Summary(pt_BR.UTF-8): Verificador ortográfico
Name: aspell
Version: 0.60.6
-Release: 3
+Release: 4
Epoch: 3
License: LGPL v2 or v2.1
Group: Applications/Text
Source0: http://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
# Source0-md5: bc80f0198773d5c05086522be67334eb
Patch0:%{name}-info.patch
-Patch1:%{name}-home_etc.patch
+# Patch1: %{name}-home_etc.patch
Patch2:%{name}-mk-static-filter.pl.patch
URL: http://aspell.net/
BuildRequires: autoconf = 2.50
@@ -110,7 +110,11 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+# home_etc patch is fubar. If HOME_ETC var is not defined, it tries to open
+# such files:
+# open($HOME|.//.aspell.conf, O_RDONLY) = -1 ENOENT (No such file or
directory)
+# Disabled until someone fixes it.
+#%%patch1 -p1
%patch2 -p0
%build
@@ -195,6 +199,13 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.94 2010/11/30 00:43:31 pawelz
+- home_etc patch is fubar. If HOME_ETC var is not defined, it tries to open
such files:
+- open($HOME|.//.aspell.conf, O_RDONLY) = -1 ENOENT (No such file or
directory)
+- Disabled until someone fixes it.
+- and once again: why are we maintaining home_etc instead of xdg dirs???
+- rel 4
+
Revision 1.93 2009/02/18 20:11:01 arekm
- release 3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aspell/aspell.spec?r1=1.93r2=1.94f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101115.tar.bz2
ekg2.spec: unexpanded macros in http://pl.ekg2.org/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url http://pl.ekg2.org/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: http://pl.ekg2.org/ekg2-20101115.tar.bz2 9cc649a5de57fc58f197e987ee3c697a ekg2-20101115.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - ekg2 switched to git (with-svn changed to with-git)
Author: pawelz Date: Sat Nov 27 21:58:39 2010 GMT
Module: packages Tag: HEAD
Log message:
- ekg2 switched to git (with-svn changed to with-git)
Files affected:
packages/ekg2:
ekg2.spec (1.134 - 1.135)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.134 packages/ekg2/ekg2.spec:1.135
--- packages/ekg2/ekg2.spec:1.134 Sun Nov 21 01:08:44 2010
+++ packages/ekg2/ekg2.spec Sat Nov 27 22:58:33 2010
@@ -20,10 +20,10 @@
%bcond_withsqlite # build logsqlite plugin based on
sqlite (conflicts with sqlite3)
%bcond_without sqlite3 # don't build logsqlite plugin based on
sqlite3
%bcond_without xosd# don't build xosd plugin
-%bcond_withsvn # checkout svn trunk instead of Source0
- requested by ekg2 developer
+%bcond_withgit # checkout svn trunk instead of Source0
- requested by ekg2 developer
-%if %{with svn}
-%definesubver svn.%(date +%Y%m%d)
+%if %{with git}
+%definesubver git.%(date +%Y%m%d)
%else
%definesubver 20101115
%endif
@@ -42,7 +42,7 @@
Epoch: 2
License: GPL v2+
Group: Applications/Communications
-%if %{without svn}
+%if %{without git}
Source0: http://pl.ekg2.org/%{name}-%{subver}.tar.bz2
# Source0-md5: 9cc649a5de57fc58f197e987ee3c697a
%endif
@@ -77,7 +77,7 @@
BuildRequires: sed = 4.0
%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_sqlite3:BuildRequires: sqlite3-devel}
-%{?with_svn:BuildRequires: subversion}
+%{?with_git:BuildRequires: git-core}
%{?with_xosd:BuildRequires:xosd-devel}
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -335,21 +335,17 @@
Wtyczka xosd dla ekg2.
%prep
-%if %{without svn}
-%setup -q -n %{name}-%{subver}
-%else
-%setup -qcT
-cd ..
-repo=http://toxygen.net/svn/ekg2/trunk;
-svn -q export --force $repo %{name}-%{version}
-cd -
-v=$(LANG=C svn info $repo/INSTALL 2/dev/null|sed -n 's/^Revision:
\([0-9]\+\)$/\1/p')
-if [ $v ]; then
-echo SVN-rev.$v
-v=SVN rev.$v
-sed -i s/AM_INIT_AUTOMAKE(ekg2, CVS)/AM_INIT_AUTOMAKE(ekg2, \$v\)/
configure.ac
+%if %{with git}
+%setup -q -T -c -n %{name}-%{subver}
+repo=%ekg2repo
+if [ $repo = %%ekg2repo ]; then
+repo=git://github.com/leafnode/ekg2.git
fi
-
+git init
+git fetch $repo master
+git checkout FETCH_HEAD
+%else
+%setup -q -n %{name}-%{subver}
%endif
%patch0 -p1
@@ -561,6 +557,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.135 2010/11/27 21:58:33 pawelz
+- ekg2 switched to git (with-svn changed to with-git)
+
Revision 1.134 2010/11/21 00:08:44 pawelz
- typo
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.134r2=1.135f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - up to 20101127
Author: pawelz Date: Sat Nov 27 22:40:04 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 20101127
Files affected:
packages/ekg2:
ekg2.spec (1.135 - 1.136)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.135 packages/ekg2/ekg2.spec:1.136
--- packages/ekg2/ekg2.spec:1.135 Sat Nov 27 22:58:33 2010
+++ packages/ekg2/ekg2.spec Sat Nov 27 23:39:59 2010
@@ -25,10 +25,10 @@
%if %{with git}
%definesubver git.%(date +%Y%m%d)
%else
-%definesubver 20101115
+%definesubver 20101127
%endif
-%definerel 2
+%definerel 1
%if %{with sqlite}
%undefine sqlite3
@@ -43,8 +43,8 @@
License: GPL v2+
Group: Applications/Communications
%if %{without git}
-Source0: http://pl.ekg2.org/%{name}-%{subver}.tar.bz2
-# Source0-md5: 9cc649a5de57fc58f197e987ee3c697a
+Source0:
https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
+# Source0-md5: baec7f1165c9f98745ff544e66e98f3d
%endif
Patch0:%{name}-perl-install.patch
Patch1:%{name}-gtk.patch
@@ -58,6 +58,7 @@
%endif
BuildRequires: gettext-devel = 0.17-8
%{?with_gadugadu:BuildRequires:giflib-devel}
+%{?with_git:BuildRequires: git-core}
%{?with_gnutls:BuildRequires: gnutls-devel = 1.2.5}
%{?with_gpg:BuildRequires: gpgme-devel}
BuildRequires: gpm-devel
@@ -77,7 +78,6 @@
BuildRequires: sed = 4.0
%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_sqlite3:BuildRequires: sqlite3-devel}
-%{?with_git:BuildRequires: git-core}
%{?with_xosd:BuildRequires:xosd-devel}
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -345,7 +345,8 @@
git fetch $repo master
git checkout FETCH_HEAD
%else
-%setup -q -n %{name}-%{subver}
+%setup -q -c -n %{name}-%{subver}
+mv leafnode-ekg2-*/* .
%endif
%patch0 -p1
@@ -396,8 +397,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f README README-main || true
-
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
%find_lang %{name}
@@ -407,7 +406,7 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS* README-main docs/ekg2book* docs/README docs/TODO docs/*.txt
+%doc NEWS* README.md docs/ekg2book* docs/README docs/TODO docs/*.txt
%attr(755,root,root) %{_bindir}/ekg2
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
@@ -443,6 +442,8 @@
%files plugin-gpg
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so
+%{_datadir}/ekg2/plugins/gpg/commands-en.txt
+%{_datadir}/ekg2/plugins/gpg/commands-pl.txt
%endif
%if %{with gtk}
@@ -537,6 +538,8 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
%{_datadir}/%{name}/scripts/*.py
+%{_datadir}/ekg2/plugins/python/commands-en.txt
+%{_datadir}/ekg2/plugins/python/commands-pl.txt
%endif
%files plugin-sim
@@ -557,6 +560,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.136 2010/11/27 22:39:59 pawelz
+- up to 20101127
+
Revision 1.135 2010/11/27 21:58:33 pawelz
- ekg2 switched to git (with-svn changed to with-git)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.135r2=1.136f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101127.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 1 STORED: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101127.tar.bz2 baec7f1165c9f98745ff544e66e98f3d ekg2-20101127.tar.bz2 Size: 1250791 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ekg2: ERRORS: ekg2-20101127.tar.bz2
ekg2.spec: unexpanded macros in https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 ekg2.spec: source 0 url https://github.com/leafnode/ekg2/tarball/master#/ekg2-git.%(date +%Y%m%d).tar.bz2 is ill-formatted Files fetched: 0 ALREADY GOT: https://github.com/leafnode/ekg2/tarball/master#/ekg2-20101127.tar.bz2 baec7f1165c9f98745ff544e66e98f3d ekg2-20101127.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2.spec - ekg 0.3 is branched, so git/master is 0.4 now. (...
Author: pawelz Date: Sat Nov 27 22:57:10 2010 GMT
Module: packages Tag: HEAD
Log message:
- ekg 0.3 is branched, so git/master is 0.4 now. (bump V:)
Files affected:
packages/ekg2:
ekg2.spec (1.136 - 1.137)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.136 packages/ekg2/ekg2.spec:1.137
--- packages/ekg2/ekg2.spec:1.136 Sat Nov 27 23:39:59 2010
+++ packages/ekg2/ekg2.spec Sat Nov 27 23:57:05 2010
@@ -37,7 +37,7 @@
Summary: Multi-protocol instant messaging and chat client
Summary(pl.UTF-8): Wieloprotokołowy komunikator internetowy
Name: ekg2
-Version: 0.3
+Version: 0.4
Release: 0.%{subver}.%{rel}
Epoch: 2
License: GPL v2+
@@ -560,6 +560,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.137 2010/11/27 22:57:05 pawelz
+- ekg 0.3 is branched, so git/master is 0.4 now. (bump V:)
+
Revision 1.136 2010/11/27 22:39:59 pawelz
- up to 20101127
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.136r2=1.137f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-commons-httpclient/java-commons-httpclient.spec - temporaril...
Author: pawelz Date: Wed Nov 24 14:55:40 2010 GMT
Module: packages Tag: HEAD
Log message:
- temporarily disabled BR: jsse and jce. Just for build-test.
- rel 3.1
Files affected:
packages/java-commons-httpclient:
java-commons-httpclient.spec (1.17 - 1.18)
Diffs:
Index: packages/java-commons-httpclient/java-commons-httpclient.spec
diff -u packages/java-commons-httpclient/java-commons-httpclient.spec:1.17
packages/java-commons-httpclient/java-commons-httpclient.spec:1.18
--- packages/java-commons-httpclient/java-commons-httpclient.spec:1.17 Wed Nov
24 14:18:33 2010
+++ packages/java-commons-httpclient/java-commons-httpclient.spec Wed Nov
24 15:55:35 2010
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Pakiet Commons HTTPClient
Name: java-commons-httpclient
Version: 3.1
-Release: 3
+Release: 3.1
License: Apache
Group: Libraries/Java
Source0:
http://www.apache.net.pl/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz
@@ -19,9 +19,9 @@
BuildRequires: java-commons-codec
BuildRequires: java-commons-logging = 1.0.3
BuildRequires: jdk
-BuildRequires: jce = 1.2.2
+# BuildRequires: jce = 1.2.2
BuildRequires: jpackage-utils
-BuildRequires: jsse = 1.0.3.01
+# BuildRequires: jsse = 1.0.3.01
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) = 1.300
%if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -170,6 +170,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.18 2010/11/24 14:55:35 pawelz
+- temporarily disabled BR: jsse and jce. Just for build-test.
+- rel 3.1
+
Revision 1.17 2010/11/24 13:18:33 baggins
- rel 3
- added metadata required for eclipse 3.6
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-httpclient/java-commons-httpclient.spec?r1=1.17r2=1.18f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-commons-httpclient/java-commons-httpclient.spec - reenable B...
Author: pawelz Date: Wed Nov 24 15:00:57 2010 GMT
Module: packages Tag: HEAD
Log message:
- reenable BRs and fix them
- rel 4
Files affected:
packages/java-commons-httpclient:
java-commons-httpclient.spec (1.18 - 1.19)
Diffs:
Index: packages/java-commons-httpclient/java-commons-httpclient.spec
diff -u packages/java-commons-httpclient/java-commons-httpclient.spec:1.18
packages/java-commons-httpclient/java-commons-httpclient.spec:1.19
--- packages/java-commons-httpclient/java-commons-httpclient.spec:1.18 Wed Nov
24 15:55:35 2010
+++ packages/java-commons-httpclient/java-commons-httpclient.spec Wed Nov
24 16:00:52 2010
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Pakiet Commons HTTPClient
Name: java-commons-httpclient
Version: 3.1
-Release: 3.1
+Release: 4
License: Apache
Group: Libraries/Java
Source0:
http://www.apache.net.pl/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz
@@ -16,12 +16,12 @@
Patch0:commons-httpclient-addosgimanifest.patch
URL: http://hc.apache.org/httpcomponents-client/index.html
BuildRequires: ant
+BuildRequires: java(jce) = 1.2.2
+BuildRequires: java(jsse) = 1.0.3.01
BuildRequires: java-commons-codec
BuildRequires: java-commons-logging = 1.0.3
BuildRequires: jdk
-# BuildRequires: jce = 1.2.2
BuildRequires: jpackage-utils
-# BuildRequires: jsse = 1.0.3.01
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) = 1.300
%if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -170,6 +170,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.19 2010/11/24 15:00:52 pawelz
+- reenable BRs and fix them
+- rel 4
+
Revision 1.18 2010/11/24 14:55:35 pawelz
- temporarily disabled BR: jsse and jce. Just for build-test.
- rel 3.1
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-httpclient/java-commons-httpclient.spec?r1=1.18r2=1.19f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jtidy/jtidy.spec - release 4
Author: pawelz Date: Wed Nov 24 07:31:39 2010 GMT Module: packages Tag: HEAD Log message: - release 4 Files affected: packages/jtidy: jtidy.spec (1.13 - 1.14) Diffs: Index: packages/jtidy/jtidy.spec diff -u packages/jtidy/jtidy.spec:1.13 packages/jtidy/jtidy.spec:1.14 --- packages/jtidy/jtidy.spec:1.13 Sun May 16 16:14:11 2010 +++ packages/jtidy/jtidy.spec Wed Nov 24 08:31:34 2010 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -%define_rel 3 +%define_rel 4 %define_java_source1.2 %define_java_target1.2 %include /usr/lib/rpm/macros.java @@ -131,6 +131,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.14 2010/11/24 07:31:34 pawelz +- release 4 + Revision 1.13 2010/05/16 14:14:11 sparky - BR: unzip CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jtidy/jtidy.spec?r1=1.13r2=1.14f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: saxon/saxon.spec - release 3
Author: pawelz Date: Wed Nov 24 07:32:56 2010 GMT
Module: packages Tag: HEAD
Log message:
- release 3
Files affected:
packages/saxon:
saxon.spec (1.31 - 1.32)
Diffs:
Index: packages/saxon/saxon.spec
diff -u packages/saxon/saxon.spec:1.31 packages/saxon/saxon.spec:1.32
--- packages/saxon/saxon.spec:1.31 Thu Apr 29 18:05:55 2010
+++ packages/saxon/saxon.spec Wed Nov 24 08:32:51 2010
@@ -13,7 +13,7 @@
Summary(pl.UTF-8): Procesor XSLT napisany w Javie
Name: saxon
Version: %{ver}
-Release: 2
+Release: 3
License: Mozilla Public License, some parts on other license
(distributable)
Group: Applications/Publishing/XML
Source0: http://downloads.sourceforge.net/saxon/%{name}%{_ver}.zip
@@ -102,6 +102,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.32 2010/11/24 07:32:51 pawelz
+- release 3
+
Revision 1.31 2010/04/29 16:05:55 pawelz
- install shell wrapper
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/saxon/saxon.spec?r1=1.31r2=1.32f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jira/jira.spec - %config(missingok) /etc/tomcat/.../jira.xml (don...
Author: pawelz Date: Mon Nov 22 13:01:54 2010 GMT
Module: packages Tag: HEAD
Log message:
- %config(missingok) /etc/tomcat/.../jira.xml (don't recreate it if user
removed/renamed this file). Not tested. Thx janekr.
Files affected:
packages/jira:
jira.spec (1.52 - 1.53)
Diffs:
Index: packages/jira/jira.spec
diff -u packages/jira/jira.spec:1.52 packages/jira/jira.spec:1.53
--- packages/jira/jira.spec:1.52Sat Oct 30 14:41:11 2010
+++ packages/jira/jira.spec Mon Nov 22 14:01:46 2010
@@ -123,7 +123,7 @@
%{_datadir}/jira
%dir %attr(750,root,tomcat) %{_sysconfdir}/jira
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,tomcat)
%{_sysconfdir}/jira/*
-%{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
+%config(missingok) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
%{_datadir}/tomcat/lib/*jar
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/jiradb
@@ -140,6 +140,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.53 2010/11/22 13:01:46 pawelz
+- %config(missingok) /etc/tomcat/.../jira.xml (don't recreate it if user
+ removed/renamed this file). Not tested. Thx janekr.
+
Revision 1.52 2010/10/30 12:41:11 pawelz
- cleanup
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira/jira.spec?r1=1.52r2=1.53f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ekg2/ekg2-bug-63.patch (NEW) - Workaround for segfault in ekg2 py...
Author: pawelz Date: Sun Nov 21 00:07:11 2010 GMT
Module: packages Tag: HEAD
Log message:
- Workaround for segfault in ekg2 python plugin (by darkjames).
- It won't be applied upstream because upstream is working on real solution.
Files affected:
packages/ekg2:
ekg2-bug-63.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/ekg2/ekg2-bug-63.patch
diff -u /dev/null packages/ekg2/ekg2-bug-63.patch:1.1
--- /dev/null Sun Nov 21 01:07:11 2010
+++ packages/ekg2/ekg2-bug-63.patch Sun Nov 21 01:07:06 2010
@@ -0,0 +1,151 @@
+diff --git plugins/python/python-window.c plugins/python/python-window.c
+index e0ac50f..3fee09a 100644
+--- plugins/python/python-window.c
plugins/python/python-window.c
+@@ -52,6 +52,48 @@
+ // *
+ // *
***
+
++PyTypeObject ekg_window_type = {
++ PyObject_HEAD_INIT(NULL)
++ 0,
++ window,
++ sizeof(ekg_windowObj),
++ 0,
++ (destructor)ekg_window_dealloc,
++ 0,
++ (getattrfunc)ekg_window_get_attr,
++ 0,
++ 0,
++ (reprfunc)ekg_window_repr,
++ 0,
++ 0,
++ 0,
++ 0, /*tp_hash */
++ 0, /*tp_call*/
++ (reprfunc)ekg_window_str, /*tp_str*/
++ 0, /*tp_getattro*/
++ 0, /*tp_setattro*/
++ 0, /*tp_as_buffer*/
++ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
++ Window object,/* tp_doc */
++ 0, /* tp_traverse
*/
++ 0, /* tp_clear */
++ 0, /*
tp_richcompare */
++ 0, /*
tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext
*/
++ ekg_window_methods, /* tp_methods */
++ 0, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get
*/
++ 0, /* tp_descr_set
*/
++ 0, /*
tp_dictoffset */
++ (initproc)ekg_window_init, /* tp_init */
++ 0, /* tp_alloc */
++ 0, /* tp_new */
++};
++
+ /**
+ * ekg_window_init()
+ *
+diff --git plugins/python/python-window.h plugins/python/python-window.h
+index 8361164..dce92ff 100644
+--- plugins/python/python-window.h
plugins/python/python-window.h
+@@ -52,48 +52,7 @@ staticforward PyMethodDef ekg_window_methods[] = {
+ {NULL, NULL, 0, NULL}
+ };
+
+-static PyTypeObject ekg_window_type = {
+- PyObject_HEAD_INIT(NULL)
+- 0,
+- window,
+- sizeof(ekg_windowObj),
+- 0,
+- (destructor)ekg_window_dealloc,
+- 0,
+- (getattrfunc)ekg_window_get_attr,
+- 0,
+- 0,
+- (reprfunc)ekg_window_repr,
+- 0,
+- 0,
+- 0,
+- 0, /*tp_hash */
+- 0, /*tp_call*/
+- (reprfunc)ekg_window_str, /*tp_str*/
+- 0, /*tp_getattro*/
+- 0, /*tp_setattro*/
+- 0, /*tp_as_buffer*/
+- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+- Window object,/* tp_doc */
+- 0, /* tp_traverse
*/
+- 0, /* tp_clear */
+- 0, /*
tp_richcompare */
+- 0, /*
tp_weaklistoffset */
+- 0, /* tp_iter */
+- 0, /* tp_iternext
*/
+- ekg_window_methods, /* tp_methods
packages: ekg2/ekg2.spec - applied bug-63 patch - rel 2
Author: pawelz Date: Sun Nov 21 00:08:30 2010 GMT
Module: packages Tag: HEAD
Log message:
- applied bug-63 patch
- rel 2
Files affected:
packages/ekg2:
ekg2.spec (1.132 - 1.133)
Diffs:
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.132 packages/ekg2/ekg2.spec:1.133
--- packages/ekg2/ekg2.spec:1.132 Mon Nov 15 08:48:58 2010
+++ packages/ekg2/ekg2.spec Sun Nov 21 01:08:25 2010
@@ -28,7 +28,7 @@
%definesubver 20101115
%endif
-%definerel 1
+%definerel 2
%if %{with sqlite}
%undefine sqlite3
@@ -48,6 +48,7 @@
%endif
Patch0:%{name}-perl-install.patch
Patch1:%{name}-gtk.patch
+Patch2:%{name}-bug-63.patch
URL: http://ekg2.org/
%{?with_aspell:BuildRequires: aspell-devel}
BuildRequires: autoconf
@@ -353,6 +354,7 @@
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i -e '\#/opt/sqlite/lib#s#$# %{_libdir}#' m4/sqlite.m4
@@ -559,6 +561,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.133 2010/11/21 00:08:25 pawelz
+- applied bug-63 patch
+- rel 2
+
Revision 1.132 2010/11/15 07:48:58 pawelz
- up to 20101115
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.132r2=1.133f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
