packages: openntpd/openntpd.spec - do NOT provide real package names, break...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 08:01:34 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- do NOT provide real package names, breaks upgrade path (sudden ntp - openttp 
migration); rel 3

 Files affected:
packages/openntpd:
   openntpd.spec (1.16 - 1.17) 

 Diffs:


Index: packages/openntpd/openntpd.spec
diff -u packages/openntpd/openntpd.spec:1.16 
packages/openntpd/openntpd.spec:1.17
--- packages/openntpd/openntpd.spec:1.16Thu Nov  5 14:12:18 2009
+++ packages/openntpd/openntpd.spec Mon Jan 11 09:01:26 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8): Wolnodostępna i łatwa w użyciu implementacja protokołu 
NTP
 Name:  openntpd
 Version:   3.9p1
-Release:   2
+Release:   3
 License:   BSD
 Group: Daemons
 Source0:   
ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/%{name}-%{version}.tar.gz
@@ -18,8 +18,8 @@
 BuildRequires: rpmbuild(macros) = 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires:  rc-scripts
-Provides:  ntp
-Provides:  ntp-client
+#Provides: ntp
+#Provides: ntp-client
 Obsoletes: ntp
 Obsoletes: ntp-client
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,6 +91,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.17  2010/01/11 08:01:26  glen
+- do NOT provide real package names, breaks upgrade path (sudden ntp - 
openttp migration); rel 3
+
 Revision 1.16  2009/11/05 13:12:18  arekm
 - rel 2; P ntp/ntp-client
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openntpd/openntpd.spec?r1=1.16r2=1.17f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: openntpd/openntpd.spec - cosmetics

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 08:03:43 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- cosmetics

 Files affected:
packages/openntpd:
   openntpd.spec (1.17 - 1.18) 

 Diffs:


Index: packages/openntpd/openntpd.spec
diff -u packages/openntpd/openntpd.spec:1.17 
packages/openntpd/openntpd.spec:1.18
--- packages/openntpd/openntpd.spec:1.17Mon Jan 11 09:01:26 2010
+++ packages/openntpd/openntpd.spec Mon Jan 11 09:03:38 2010
@@ -26,15 +26,18 @@
 
 %description
 OpenNTPD is a FREE, easy to use implementation of the Network Time
-Protocol. It provides the ability to sync the local clock to remote
-NTP servers and can act as NTP server itself, redistributing the local
-clock.
+Protocol.
+
+It provides the ability to sync the local clock to remote NTP servers
+and can act as NTP server itself, redistributing the local clock.
 
 %description -l pl.UTF-8
 OpenNTPD to wolnodostępna, łatwa w użyciu implementacja protokołu NTP
-(Network Time Protocol). Daje możliwość synchronizacji lokalnego
-zegara ze zdalnymi serwerami NTP i może działać samemu jako serwer
-NTP, rozpowszechniając lokalny zegar.
+(Network Time Protocol).
+
+Daje możliwość synchronizacji lokalnego zegara ze zdalnymi serwerami
+NTP i może działać samemu jako serwer NTP, rozpowszechniając lokalny
+zegar.
 
 %prep
 %setup -q
@@ -60,12 +63,12 @@
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
 
 %post
 /sbin/chkconfig --add ntpd
-%service ntpd restart %{name} daemon
+%service ntpd restart OpenNTP Daemon
 
 %preun
 if [ $1 = 0 ]; then
@@ -91,6 +94,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.18  2010/01/11 08:03:38  glen
+- cosmetics
+
 Revision 1.17  2010/01/11 08:01:26  glen
 - do NOT provide real package names, breaks upgrade path (sudden ntp - 
openttp migration); rel 3
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openntpd/openntpd.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 (AC-branch): gnupg/gnupg.spec - merge update to 1.4.10 from HEAD

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 08:12:16 2010 GMT
Module: packages  Tag: AC-branch
 Log message:
- merge update to 1.4.10 from HEAD

 Files affected:
packages/gnupg:
   gnupg.spec (1.126 - 1.126.2.1) 

 Diffs:


Index: packages/gnupg/gnupg.spec
diff -u packages/gnupg/gnupg.spec:1.126 packages/gnupg/gnupg.spec:1.126.2.1
--- packages/gnupg/gnupg.spec:1.126 Wed Feb 27 23:42:20 2008
+++ packages/gnupg/gnupg.spec   Mon Jan 11 09:12:11 2010
@@ -13,13 +13,14 @@
 Summary(uk.UTF-8): GNU Privacy Guard - вільна заміна PGP
 Summary(zh_CN.UTF-8):  GPL的PGP加密程序
 Name:  gnupg
-Version:   1.4.8
-Release:   2
+Version:   1.4.10
+Release:   1
 License:   GPL v3+
 Group: Applications/File
 Source0:   ftp://ftp.gnupg.org/GnuPG/gnupg/%{name}-%{version}.tar.bz2
-# Source0-md5: e5be39ea81bb07de006e7dd44439cb76
+# Source0-md5: dcf7ed712997888d616e029637bfc303
 Patch0:%{name}-info.patch
+# send it upstream after updating !
 Patch1:%{name}-pl.po-update.patch
 Patch2:%{name}-fix.patch
 Patch3:%{name}-sparc64.patch
@@ -177,7 +178,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
@@ -203,6 +204,9 @@
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_mandir}/ru/man1
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/gpg.ru.1 
$RPM_BUILD_ROOT%{_mandir}/ru/man1/gpg.1
+
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT{%{_datadir}/gnupg/{FAQ,faq.html},%{_infodir}/dir}
@@ -210,21 +214,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p  /sbin/postshell
+%post  -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun-p  /sbin/postshell
+%postun-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO doc/{DETAILS,FAQ,OpenPGP}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/gpg
+%attr(755,root,root) %{_bindir}/gpg-zip
+%attr(755,root,root) %{_bindir}/gpgsplit
+%attr(755,root,root) %{_bindir}/gpgv
 %dir %{_libexecdir}/gnupg
 %dir %{_datadir}/gnupg
 %{_datadir}/gnupg/options.skel
-%{_mandir}/man?/*
-%{_infodir}/*.info*
+%{_mandir}/man1/gpg.1*
+%{_mandir}/man1/gpg-zip.1*
+%{_mandir}/man1/gpgv.1*
+%{_mandir}/man7/gnupg.7*
+%lang(ru) %{_mandir}/ru/man1/gpg.1*
+%{_infodir}/gnupg1.info*
 
 %files plugin-keys_finger
 %defattr(644,root,root,755)
@@ -254,6 +265,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.126.2.1  2010/01/11 08:12:11  glen
+- merge update to 1.4.10 from HEAD
+
 Revision 1.126  2008/02/27 22:42:20  glen
 - revert openldap ver bump
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnupg/gnupg.spec?r1=1.126r2=1.126.2.1f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: openntpd/openntpd.spec - arekm: drop Obsoletes then too! Otherwis...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 08:56:30 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- arekm: drop Obsoletes then too! Otherwise poldek will think that this pkg 
replaces ntp.spec
- rel 4

 Files affected:
packages/openntpd:
   openntpd.spec (1.18 - 1.19) 

 Diffs:


Index: packages/openntpd/openntpd.spec
diff -u packages/openntpd/openntpd.spec:1.18 
packages/openntpd/openntpd.spec:1.19
--- packages/openntpd/openntpd.spec:1.18Mon Jan 11 09:03:38 2010
+++ packages/openntpd/openntpd.spec Mon Jan 11 09:56:25 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8): Wolnodostępna i łatwa w użyciu implementacja protokołu 
NTP
 Name:  openntpd
 Version:   3.9p1
-Release:   3
+Release:   4
 License:   BSD
 Group: Daemons
 Source0:   
ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/%{name}-%{version}.tar.gz
@@ -20,8 +20,8 @@
 Requires:  rc-scripts
 #Provides: ntp
 #Provides: ntp-client
-Obsoletes: ntp
-Obsoletes: ntp-client
+#Obsoletes:ntp
+#Obsoletes:ntp-client
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,6 +94,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.19  2010/01/11 08:56:25  glen
+- arekm: drop Obsoletes then too! Otherwise poldek will think that this pkg 
replaces ntp.spec
+- rel 4
+
 Revision 1.18  2010/01/11 08:03:38  glen
 - cosmetics
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openntpd/openntpd.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


SVN: rc-scripts/trunk/sysconfig/system

2010-01-11 Thread arekm
Author: arekm
Date: Mon Jan 11 10:07:34 2010
New Revision: 11098

Modified:
   rc-scripts/trunk/sysconfig/system
Log:
Drop EVMS_MD since it's not used.

Modified: rc-scripts/trunk/sysconfig/system
==
--- rc-scripts/trunk/sysconfig/system   (original)
+++ rc-scripts/trunk/sysconfig/system   Mon Jan 11 10:07:34 2010
@@ -82,9 +82,6 @@
 # Create symlinks for LVM volumes (/dev/evms/lvm/* - /dev/*)
 EVMS_LVM_COMPAT_NODES=yes
 
-# Use EVMS for Linux MD (RAID 0/1/5) volumes
-EVMS_MD=no
-
 # EVMS AIX LVM volumes
 EVMS_AIX=no
 
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: mathomatic-15.0.3.tar.bz2

2010-01-11 Thread amateja

Files fetched: 1

STORED: http://www.panix.com/~gesslein/mathomatic-15.0.3.tar.bz2
34e9fe24c007c3aaf805f0b5a17bb1ee  mathomatic-15.0.3.tar.bz2
Size: 171665 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: mathomatic/mathomatic.spec - updated to 15.0.3

2010-01-11 Thread amateja
Author: amateja  Date: Mon Jan 11 09:22:55 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- updated to 15.0.3

 Files affected:
packages/mathomatic:
   mathomatic.spec (1.86 - 1.87) 

 Diffs:


Index: packages/mathomatic/mathomatic.spec
diff -u packages/mathomatic/mathomatic.spec:1.86 
packages/mathomatic/mathomatic.spec:1.87
--- packages/mathomatic/mathomatic.spec:1.86Mon Dec 28 09:15:52 2009
+++ packages/mathomatic/mathomatic.spec Mon Jan 11 10:22:50 2010
@@ -3,12 +3,12 @@
 Summary(hu.UTF-8): Mathomatic - szimbolikus számításokra képes program
 Summary(pl.UTF-8): Mathomatic - program do matematyki symbolicznej
 Name:  mathomatic
-Version:   15.0.2
+Version:   15.0.3
 Release:   1
 License:   LGPL
 Group: Applications/Math
 Source0:   http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-# Source0-md5: 447797008f9344d8743b392eb954ac20
+# Source0-md5: 34e9fe24c007c3aaf805f0b5a17bb1ee
 URL:   http://www.mathomatic.com/math/
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -67,6 +67,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.87  2010/01/11 09:22:50  amateja
+- updated to 15.0.3
+
 Revision 1.86  2009/12/28 08:15:52  amateja
 - updated to 15.0.2
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mathomatic/mathomatic.spec?r1=1.86r2=1.87f=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): kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addon...

2010-01-11 Thread shadzik
Author: shadzik  Date: Mon Jan 11 09:32:24 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- moved to DEVEL as requested by lmasko, he will also decrease deps on HEAD

 Files affected:
packages/kde4-kdeplasma-addons-networkmanager:
   kde4-kdeplasma-addons-networkmanager.spec (1.14 - 1.14.2.1) 

 Diffs:


Index: 
packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec
diff -u 
packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec:1.14
 
packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec:1.14.2.1
--- 
packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec:1.14
Mon Dec 14 01:11:12 2009
+++ 
packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec
 Mon Jan 11 10:32:18 2010
@@ -16,14 +16,14 @@
 Source0:   %{origname}-%{snap}.tar.gz
 # Source0-md5: 437c5733c88dd190e0236bfb9bc84d72
 URL:   http://en.opensuse.org/Projects/KNetworkManager
-BuildRequires: NetworkManager-devel = 0.7.0
+BuildRequires: NetworkManager-devel = 0.7.1
 BuildRequires: Qt3Support-devel = %{qtver}
 BuildRequires: QtCore-devel = %{qtver}
 BuildRequires: QtDBus-devel = %{qtver}
 BuildRequires: QtGui-devel = %{qtver}
 BuildRequires: QtNetwork-devel = %{qtver}
 BuildRequires: QtXml-devel = %{qtver}
-BuildRequires: cmake = 2.6.2
+BuildRequires: cmake = 2.6.3
 BuildRequires: kde4-kdebase-workspace-devel = %{version}
 BuildRequires: rpmbuild(macros) = 1.293
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,6 +101,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.14.2.1  2010/01/11 09:32:18  shadzik
+- moved to DEVEL as requested by lmasko, he will also decrease deps on HEAD
+
 Revision 1.14  2009/12/14 00:11:12  shadzik
 - current snap
 - lots of things changed including files and cosmetics


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeplasma-addons-networkmanager/kde4-kdeplasma-addons-networkmanager.spec?r1=1.14r2=1.14.2.1f=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): kde4-kdebluetooth/kde4-kdebluetooth.spec - moved to DEVEL...

2010-01-11 Thread shadzik
Author: shadzik  Date: Mon Jan 11 10:10:42 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- moved to DEVEL, requested by lmasko

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.7.2.1 - 1.7.2.2) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.7.2.1 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.7.2.2
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.7.2.1   Sat Aug 22 
02:01:27 2009
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 11:10:37 2010
@@ -21,7 +21,7 @@
 BuildRequires: QtDBus-devel = %{qtver}
 BuildRequires: QtGui-devel = %{qtver}
 BuildRequires: automoc4
-BuildRequires: cmake = 2.6.2
+BuildRequires: cmake = 2.6.3
 BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}-5
 BuildRequires: kde4-kdelibs-devel = %{kde4ver}
 BuildRequires: qt4-build = %{qtver}
@@ -84,6 +84,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.7.2.2  2010/01/11 10:10:37  shadzik
+- moved to DEVEL, requested by lmasko
+
 Revision 1.7.2.1  2009/08/22 00:01:27  cactus
 - up to 0.3 svn 1014227
 - files


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.spec?r1=1.7.2.1r2=1.7.2.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 (DEVEL): kde4-kdebluetooth/kde4-kdebluetooth.spec - again, tihs ti...

2010-01-11 Thread shadzik
Author: shadzik  Date: Mon Jan 11 10:12:19 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- again, tihs time do it right, moved to DEVEL

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.15 - 1.15.2.1) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15.2.1
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15  Sat Dec  5 
13:27:38 2009
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 11:12:14 2010
@@ -23,7 +23,7 @@
 BuildRequires: QtNetwork-devel = %{qtver}
 BuildRequires: QtSvg-devel = %{qtver}
 BuildRequires: automoc4
-BuildRequires: cmake = 2.6.2
+BuildRequires: cmake = 2.6.3
 BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}-5
 BuildRequires: kde4-kdelibs-devel = %{kde4ver}
 BuildRequires: qt4-build = %{qtver}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15.2.1  2010/01/11 10:12:14  shadzik
+- again, tihs time do it right, moved to DEVEL
+
 Revision 1.15  2009/12/05 12:27:38  shadzik
 - kdever up
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.spec?r1=1.15r2=1.15.2.1f=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): kde4-kdebluetooth/kde4-kdebluetooth.spec - correct BR

2010-01-11 Thread shadzik
Author: shadzik  Date: Mon Jan 11 10:14:25 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- correct BR

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.15.2.1 - 1.15.2.2) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15.2.1 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15.2.2
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15.2.1  Mon Jan 11 
11:12:14 2010
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 11:14:20 2010
@@ -24,7 +24,7 @@
 BuildRequires: QtSvg-devel = %{qtver}
 BuildRequires: automoc4
 BuildRequires: cmake = 2.6.3
-BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}-5
+BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}
 BuildRequires: kde4-kdelibs-devel = %{kde4ver}
 BuildRequires: qt4-build = %{qtver}
 BuildRequires: qt4-qmake = %{qtver}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15.2.2  2010/01/11 10:14:20  shadzik
+- correct BR
+
 Revision 1.15.2.1  2010/01/11 10:12:14  shadzik
 - again, tihs time do it right, moved to DEVEL
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.spec?r1=1.15.2.1r2=1.15.2.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: kde4-kdebluetooth/kde4-kdebluetooth.spec - correct BR

2010-01-11 Thread shadzik
Author: shadzik  Date: Mon Jan 11 10:14:51 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- correct BR

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.15 - 1.16) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.16
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.15  Sat Dec  5 
13:27:38 2009
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 11:14:46 2010
@@ -24,7 +24,7 @@
 BuildRequires: QtSvg-devel = %{qtver}
 BuildRequires: automoc4
 BuildRequires: cmake = 2.6.2
-BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}-5
+BuildRequires: kde4-kdebase-workspace-devel = %{kde4ver}
 BuildRequires: kde4-kdelibs-devel = %{kde4ver}
 BuildRequires: qt4-build = %{qtver}
 BuildRequires: qt4-qmake = %{qtver}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.16  2010/01/11 10:14:46  shadzik
+- correct BR
+
 Revision 1.15  2009/12/05 12:27:38  shadzik
 - kdever up
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.spec?r1=1.15r2=1.16f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: rc-scripts/trunk/changelog.sh

2010-01-11 Thread glen
Author: glen
Date: Mon Jan 11 11:52:18 2010
New Revision: 11099

Modified:
   rc-scripts/trunk/changelog.sh
Log:
- C locale for consistent changelog

Modified: rc-scripts/trunk/changelog.sh
==
--- rc-scripts/trunk/changelog.sh   (original)
+++ rc-scripts/trunk/changelog.sh   Mon Jan 11 11:52:18 2010
@@ -29,7 +29,7 @@
 else
charset=ISO8859-2
 fi
-svn log -v --xml | svn2log --users-charset=$charset --domain pld-linux.org 
-p $branch -u $tmp --exclude ChangeLog -o ChangeLog
+LC_ALL=C svn log -v --xml | LC_ALL=C svn2log --users-charset=$charset --domain 
pld-linux.org -p $branch -u $tmp --exclude ChangeLog -o ChangeLog
 rm -f $tmp
 
 # obfuscate emails u...@domain and (u...@domain)
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: docsis/docsis.spec - mibs installed to system mibs dir, add mibs ...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 11:04:59 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- mibs installed to system mibs dir, add mibs package; rel 3

 Files affected:
packages/docsis:
   docsis.spec (1.4 - 1.5) 

 Diffs:


Index: packages/docsis/docsis.spec
diff -u packages/docsis/docsis.spec:1.4 packages/docsis/docsis.spec:1.5
--- packages/docsis/docsis.spec:1.4 Sun Sep 28 20:21:45 2008
+++ packages/docsis/docsis.spec Mon Jan 11 12:04:53 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8): Kodowanie ustawień konfiguracyjnych w plikach binarnych 
wg DOCSIS RFI 1.1
 Name:  docsis
 Version:   0.9.5
-Release:   2
+Release:   3
 License:   GPL v2
 Group: Applications
 Source0:   http://dl.sourceforge.net/docsis/%{name}-%{version}.tar.gz
@@ -13,10 +13,10 @@
 URL:   http://docsis.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool 
 BuildRequires: flex
+BuildRequires: libtool
 BuildRequires: net-snmp-devel
-Requires:  net-snmp-mibs
+Requires:  mibs-%{name}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,6 +27,15 @@
 Kodowanie ustawień konfiguracyjnych w binarnych plikach
 konfiguracyjnych zgodnie z DOCSIS RFI 1.1.
 
+%package -n mibs-%{name}
+Summary:   MIBs from DOCSIS
+Group: Base
+Requires:  mibs-dirs
+Requires:  mibs-net-snmp
+
+%description -n mibs-%{name}
+MIBs (Management Information Base) from DOCSIS.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -45,7 +54,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-   DESTDIR=$RPM_BUILD_ROOT
+   DESTDIR=$RPM_BUILD_ROOT \
+   mibsdir=%{_datadir}/mibs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,9 +63,12 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/docsis
 %{_datadir}/%{name}
-%{_datadir}/snmp/mibs/*
+
+%files -n mibs-%{name}
+%defattr(644,root,root,755)
+%{_datadir}/mibs/*
 
 %define date%(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -63,6 +76,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.5  2010/01/11 11:04:53  glen
+- mibs installed to system mibs dir, add mibs package; rel 3
+
 Revision 1.4  2008/09/28 18:21:45  twittner
 - BR: libtool added
 - rel. 2


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/docsis/docsis.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


packages: docsis/docsis.spec - BR: bison

2010-01-11 Thread sparky
Author: sparky   Date: Mon Jan 11 11:36:02 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- BR: bison

 Files affected:
packages/docsis:
   docsis.spec (1.5 - 1.6) 

 Diffs:


Index: packages/docsis/docsis.spec
diff -u packages/docsis/docsis.spec:1.5 packages/docsis/docsis.spec:1.6
--- packages/docsis/docsis.spec:1.5 Mon Jan 11 12:04:53 2010
+++ packages/docsis/docsis.spec Mon Jan 11 12:35:57 2010
@@ -13,6 +13,7 @@
 URL:   http://docsis.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: net-snmp-devel
@@ -76,6 +77,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.6  2010/01/11 11:35:57  sparky
+- BR: bison
+
 Revision 1.5  2010/01/11 11:04:53  glen
 - mibs installed to system mibs dir, add mibs package; rel 3
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/docsis/docsis.spec?r1=1.5r2=1.6f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: diffpreview.zip

2010-01-11 Thread glen

Files fetched: 1

STORED: no-url://diffpreview.zip
c3a2fd5680aa733b4bec116c59786b68  diffpreview.zip
Size: 3150 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: dokuwiki-plugin-diffpreview/dokuwiki-plugin-diffpreview.spec (NEW...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 11:38:57 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- new

 Files affected:
packages/dokuwiki-plugin-diffpreview:
   dokuwiki-plugin-diffpreview.spec (NONE - 1.1)  (NEW)

 Diffs:


Index: packages/dokuwiki-plugin-diffpreview/dokuwiki-plugin-diffpreview.spec
diff -u /dev/null 
packages/dokuwiki-plugin-diffpreview/dokuwiki-plugin-diffpreview.spec:1.1
--- /dev/null   Mon Jan 11 12:38:57 2010
+++ packages/dokuwiki-plugin-diffpreview/dokuwiki-plugin-diffpreview.spec   
Mon Jan 11 12:38:52 2010
@@ -0,0 +1,61 @@
+# $Revision$, $Date$
+%defineplugin  diffpreview
+Summary:   DokuWiki diff preview plugin
+Summary(pl.UTF-8): Wtyczka diffpreview dla DokuWiki
+Name:  dokuwiki-plugin-%{plugin}
+Version:   20100110
+Release:   0.1
+License:   GPL v2
+Group: Applications/WWW
+# Source0Download: http://bugs.splitbrain.org/index.php?getfile=280
+Source0:   diffpreview.zip
+# Source0-md5: c3a2fd5680aa733b4bec116c59786b68
+URL:   http://wiki.splitbrain.org/plugin:diffpreview
+BuildRequires: rpmbuild(macros) = 1.520
+Requires:  dokuwiki = 20090214
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%definedokuconf/etc/webapps/dokuwiki
+%definedokudir /usr/share/dokuwiki
+%defineplugindir   %{dokudir}/lib/plugins/%{plugin}
+%definefind_lang   %{_usrlibrpm}/dokuwiki-find-lang.sh 
%{buildroot}
+
+%description
+Adds a new button to show a diff-like preview of all changes while
+editing a page.
+
+%prep
+%setup -q -n %{plugin}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
+
+# find locales
+%find_lang %{name}.lang
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+# force css cache refresh
+if [ -f %{dokuconf}/local.php ]; then
+   touch %{dokuconf}/local.php
+fi
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%dir %{plugindir}
+%{plugindir}/*.php
+%{plugindir}/*.js
+
+%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  2010/01/11 11:38:52  glen
+- new

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: ipmiutil/ipmiutil.spec - mibs installed to system mibs dir, add m...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 11:43:10 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- mibs installed to system mibs dir, add mibs package; rel 3

 Files affected:
packages/ipmiutil:
   ipmiutil.spec (1.21 - 1.22) 

 Diffs:


Index: packages/ipmiutil/ipmiutil.spec
diff -u packages/ipmiutil/ipmiutil.spec:1.21 
packages/ipmiutil/ipmiutil.spec:1.22
--- packages/ipmiutil/ipmiutil.spec:1.21Tue Jan  5 21:23:49 2010
+++ packages/ipmiutil/ipmiutil.spec Mon Jan 11 12:43:05 2010
@@ -1,10 +1,21 @@
 # $Revision$, $Date$
+# TODO
+# - unpackaged:
+#   /etc/cron.daily/checksel
+#   /etc/rc.d/init.d/ipmi_port
+#   /etc/rc.d/init.d/ipmiutil_asy
+#   /etc/rc.d/init.d/ipmiutil_wdt
+#   /usr/share/ipmiutil/COPYING
+#   /usr/share/ipmiutil/README
+#   /usr/share/ipmiutil/UserGuide
+#   /usr/share/ipmiutil/evt.sh
+#   /usr/share/ipmiutil/ipmi_if.sh
 %bcond_without gpl
 Summary:   IPMI Management Utilities
 Summary(pl.UTF-8): Narzędzia zarządzające IPMI
 Name:  ipmiutil
 Version:   2.5.2
-Release:   1
+Release:   3
 %if %{with gpl}
 License:   GPL
 %else
@@ -21,9 +32,10 @@
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: openssl-devel
+Requires:  mibs-%{name}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%definemibsdir /usr/share/snmp/mibs
+%definemibsdir /usr/share/mibs
 
 %description
 The ipmiutil component package provides utilities to view the SEL
@@ -45,18 +57,20 @@
 Sterownik IPMI może być dostarczony przez sterownik Intel IPMI
 (/dev/imb), albo przez sterownik valinux IPMI (/dev/ipmikcs).
 
-%package mibs
-Summary:   MIB database
+%package -n mibs-%{name}
+Summary:   MIB database from IPMI Management Utilities
 Summary(pl.UTF-8): Baza danych MIB
 Group: Applications/System
+Requires:  mibs-dirs
 Requires:  net-snmp-mibs
+Obsoletes: ipmiutil-mibs
 
-%description mibs
+%description -n mibs-%{name}
 This package contains MIB files from Intel:
 - Alert on LAN MIB
 - MIB file for PET events
 
-%description mibs -l pl.UTF-8
+%description -n mibs-%{name} -l pl.UTF-8
 Ten pakiet zawiera pliki MIB od Intela:
 - alarmy dla LAN MIB
 - plik MIB dla zdarzeń PET
@@ -137,7 +151,7 @@
 %{_mandir}/man8/tmconfig.8*
 %{_mandir}/man8/wdt.8*
 
-%files mibs
+%files -n mibs-%{name}
 %defattr(644,root,root,755)
 %{mibsdir}/bmclanaol.mib
 %{mibsdir}/bmclanpet.mib
@@ -148,6 +162,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.22  2010/01/11 11:43:05  glen
+- mibs installed to system mibs dir, add mibs package; rel 3
+
 Revision 1.21  2010/01/05 20:23:49  sparky
 - BR: openssl-devel
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil.spec?r1=1.21r2=1.22f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/rsget.pl/Get/StorageTo

2010-01-11 Thread sparky
Author: sparky
Date: Mon Jan 11 13:27:13 2010
New Revision: 11100

Modified:
   toys/rsget.pl/Get/StorageTo
Log:
- allows parallel downloads now


Modified: toys/rsget.pl/Get/StorageTo
==
--- toys/rsget.pl/Get/StorageTo (original)
+++ toys/rsget.pl/Get/StorageTo Mon Jan 11 13:27:13 2010
@@ -9,6 +9,7 @@
 short: ST
 web: http://storage.to/;
 uri: qr{storage\.to/get/[a-zA-Z0-9]{8}([\?/].*?)?$}
+slots: max
 status: OK 2009-10-23
 
 start:
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: dokuwiki/dokuwiki.spec, dokuwiki/task-1821.patch (NEW) - add $r1, ...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 12:37:16 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- add $r1, $r2 GET params support in diff action

 Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.68 - 1.69) , task-1821.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.68 
packages/dokuwiki/dokuwiki.spec:1.69
--- packages/dokuwiki/dokuwiki.spec:1.68Mon Jan  4 19:19:56 2010
+++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 13:37:10 2010
@@ -42,6 +42,7 @@
 Patch18:   install.patch
 Patch19:   pld-branding.patch
 Patch20:   fixprivilegeescalationbug.diff
+Patch21:   task-1821.patch
 URL:   http://www.dokuwiki.org/dokuwiki
 BuildRequires: rpm-php-pearprov = 4.4.2-11
 BuildRequires: rpmbuild(macros) = 1.520
@@ -130,6 +131,7 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %patch66 -p1
 
@@ -354,6 +356,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.69  2010/01/11 12:37:10  glen
+- add $r1, $r2 GET params support in diff action
+
 Revision 1.68  2010/01/04 18:19:56  glen
 - up to 2009-12-25 release
 


Index: packages/dokuwiki/task-1821.patch
diff -u /dev/null packages/dokuwiki/task-1821.patch:1.1
--- /dev/null   Mon Jan 11 13:37:16 2010
+++ packages/dokuwiki/task-1821.patch   Mon Jan 11 13:37:10 2010
@@ -0,0 +1,16 @@
+--- dokuwiki/inc/html.php~ 2010-01-11 14:35:04.0 +0200
 dokuwiki/inc/html.php  2010-01-11 14:35:07.213389784 +0200
+@@ -862,8 +862,12 @@
+ // given as rev and rev2 parameters, with rev2 being optional. Or in an
+ // array in rev2.
+ $rev1 = $REV;
++  // handle $r1 + $r2, see DW #1821
++  if (isset($_REQUEST['r1'])  isset($_REQUEST['r2'])) {
++$rev1 = (int) $_REQUEST['r1'];
++$rev2 = (int) $_REQUEST['r2'];
+ 
+-if(is_array($_REQUEST['rev2'])){
++  } else if(is_array($_REQUEST['rev2'])){
+ $rev1 = (int) $_REQUEST['rev2'][0];
+ $rev2 = (int) $_REQUEST['rev2'][1];
+ 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.68r2=1.69f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/rsget.pl/RSGet/FileList.pm

2010-01-11 Thread sparky
Author: sparky
Date: Mon Jan 11 13:43:21 2010
New Revision: 11101

Modified:
   toys/rsget.pl/RSGet/FileList.pm
Log:
- forgot to finish last change


Modified: toys/rsget.pl/RSGet/FileList.pm
==
--- toys/rsget.pl/RSGet/FileList.pm (original)
+++ toys/rsget.pl/RSGet/FileList.pm Mon Jan 11 13:43:21 2010
@@ -168,13 +168,9 @@
} elsif ( m{^((?:http|https|ftp)://)?(.*?\..*?/.*)$} ) {
my $proto = $1 || http://;;
my $uri = $proto . $2;
-   my $getter = RSGet::Plugin::from_uri( $uri );
-   if ( $getter ) {
-   $uri = $getter-unify( $uri );
-   $options = {};
-   $decoded{ $uri } = $options;
-   next;
-   }
+   $options = {};
+   $decoded{ $uri } = $options;
+   next;
}
 
push @invalid, $_;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: dokuwiki/dokuwiki-mailtext.patch - add diff url to email

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 12:48:32 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- add diff url to email

 Files affected:
packages/dokuwiki:
   dokuwiki-mailtext.patch (1.2 - 1.3) 

 Diffs:


Index: packages/dokuwiki/dokuwiki-mailtext.patch
diff -u packages/dokuwiki/dokuwiki-mailtext.patch:1.2 
packages/dokuwiki/dokuwiki-mailtext.patch:1.3
--- packages/dokuwiki/dokuwiki-mailtext.patch:1.2   Mon Aug 18 20:09:43 2008
+++ packages/dokuwiki/dokuwiki-mailtext.patch   Mon Jan 11 13:48:27 2010
@@ -1,6 +1,6 @@
 dokuwiki-2008-05-05/inc/lang/en/mailtext.txt~  2008-08-18 
21:00:26.0 +0300
-+++ dokuwiki-2008-05-05/inc/lang/en/mailtext.txt   2008-08-18 
21:01:33.357452202 +0300
-@@ -1,14 +1,7 @@
+--- dokuwiki-2008-05-05/inc/lang/en/mailtext.txt   2008-08-18 
21:01:33.357452202 +0300
 dokuwiki-2009-12-25/inc/lang/en/mailtext.txt   2010-01-11 
14:44:31.57315 +0200
+@@ -1,17 +1,11 @@
 -A page in your DokuWiki was added or changed. Here are the details:
 -
 -Date: @DATE@
@@ -17,4 +17,9 @@
  @NEWPAGE@
  @DIFF@
  
- 
+-
++Diff URL:
++  @DIFFPAGE@
+ -- 
+ This mail was generated by DokuWiki at
+ @DOKUWIKIURL@


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki-mailtext.patch?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: dokuwiki/task-1821.patch - include @DIFFPAGE@ placeholder in emai...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 12:49:38 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- include @DIFFPAGE@ placeholder in email template

 Files affected:
packages/dokuwiki:
   task-1821.patch (1.1 - 1.2) 

 Diffs:


Index: packages/dokuwiki/task-1821.patch
diff -u packages/dokuwiki/task-1821.patch:1.1 
packages/dokuwiki/task-1821.patch:1.2
--- packages/dokuwiki/task-1821.patch:1.1   Mon Jan 11 13:37:10 2010
+++ packages/dokuwiki/task-1821.patch   Mon Jan 11 13:49:33 2010
@@ -14,3 +14,14 @@
  $rev1 = (int) $_REQUEST['rev2'][0];
  $rev2 = (int) $_REQUEST['rev2'][1];
  
+--- dokuwiki/inc/common.php~   2010-01-11 14:48:54.0 +0200
 dokuwiki/inc/common.php2010-01-11 14:48:58.213308444 +0200
+@@ -1128,6 +1128,8 @@
+   }elseif($rev){
+ $subject = $lang['mail_changed'].' '.$id;
+ $text = str_replace('@OLDPAGE@',wl($id,rev=$rev,true,''),$text);
++$rev2 = $INFO['meta']['date']['modified'];
++$text = 
str_replace('@DIFFPAGE@',wl($id,do=diffr1=$revr2=$rev2,true,''),$text);
+ require_once(DOKU_INC.'inc/DifferenceEngine.php');
+ $df  = new Diff(explode(\n,rawWiki($id,$rev)),
+ explode(\n,rawWiki($id)));


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/task-1821.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: dokuwiki/dokuwiki.spec, dokuwiki/adldap.patch (NEW) - use system ...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 12:49:57 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- use system adldap package

 Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.69 - 1.70) , adldap.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.69 
packages/dokuwiki/dokuwiki.spec:1.70
--- packages/dokuwiki/dokuwiki.spec:1.69Mon Jan 11 13:37:10 2010
+++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 13:49:52 2010
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - external: http://adldap.sourceforge.net/
 %definesubver  2009-12-25
 %definever %(echo %{subver} | tr -d -)
 %definephp_min_version 5.1.2
@@ -9,7 +7,7 @@
 Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
 Name:  dokuwiki
 Version:   %{ver}
-Release:   0.16
+Release:   0.18
 License:   GPL v2
 Group: Applications/WWW
 Source0:   
http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -43,6 +41,7 @@
 Patch19:   pld-branding.patch
 Patch20:   fixprivilegeescalationbug.diff
 Patch21:   task-1821.patch
+Patch22:   adldap.patch
 URL:   http://www.dokuwiki.org/dokuwiki
 BuildRequires: rpm-php-pearprov = 4.4.2-11
 BuildRequires: rpmbuild(macros) = 1.520
@@ -54,6 +53,7 @@
 Requires:  webserver(access)
 Requires:  webserver(alias)
 Requires:  webserver(php)
+Suggests:  php-adldap = 3.3.1
 Suggests:  php-gd
 # can use gz compression to store attic pages
 Suggests:  php-zlib
@@ -132,6 +132,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %patch66 -p1
 
@@ -145,6 +146,9 @@
 rm -f inc/geshi.php
 rm -rf inc/geshi
 
+# use system adldap package
+rm -f inc/adLDAP.php
+
 # use system simplepie package
 rm -f inc/SimplePie.php
 
@@ -356,6 +360,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.70  2010/01/11 12:49:52  glen
+- use system adldap package
+
 Revision 1.69  2010/01/11 12:37:10  glen
 - add $r1, $r2 GET params support in diff action
 


Index: packages/dokuwiki/adldap.patch
diff -u /dev/null packages/dokuwiki/adldap.patch:1.1
--- /dev/null   Mon Jan 11 13:49:58 2010
+++ packages/dokuwiki/adldap.patch  Mon Jan 11 13:49:52 2010
@@ -0,0 +1,11 @@
+--- dokuwiki-2009-12-25/inc/auth/ad.class.php~ 2009-12-25 12:14:41.0 
+0200
 dokuwiki-2009-12-25/inc/auth/ad.class.php  2010-01-11 14:46:38.446655609 
+0200
+@@ -32,7 +32,7 @@
+  *  @author  Andreas Gohr a...@splitbrain.org
+  */
+ 
+-require_once(DOKU_INC.'inc/adLDAP.php');
++require_once 'adLDAP.php';
+ 
+ class auth_ad extends auth_basic {
+ var $cnf = null;


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.69r2=1.70f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: gvfs/gvfs.spec - release 3

2010-01-11 Thread hawk
Author: hawk Date: Mon Jan 11 12:50:21 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 3

 Files affected:
packages/gvfs:
   gvfs.spec (1.34 - 1.35) 

 Diffs:


Index: packages/gvfs/gvfs.spec
diff -u packages/gvfs/gvfs.spec:1.34 packages/gvfs/gvfs.spec:1.35
--- packages/gvfs/gvfs.spec:1.34Thu Dec 31 17:47:12 2009
+++ packages/gvfs/gvfs.spec Mon Jan 11 13:50:16 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8): gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:  gvfs
 Version:   1.4.3
-Release:   2
+Release:   3
 License:   LGPL v2+
 Group: Libraries
 Source0:   
http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.4/%{name}-%{version}.tar.bz2
@@ -221,6 +221,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.35  2010/01/11 12:50:16  hawk
+- release 3
+
 Revision 1.34  2009/12/31 16:47:12  megabajt
 - release 2
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gvfs/gvfs.spec?r1=1.34r2=1.35f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/rsget.pl/RSGet/FileList.pm

2010-01-11 Thread sparky
Author: sparky
Date: Mon Jan 11 13:54:57 2010
New Revision: 11102

Modified:
   toys/rsget.pl/RSGet/FileList.pm
Log:
- nasty bug fixed


Modified: toys/rsget.pl/RSGet/FileList.pm
==
--- toys/rsget.pl/RSGet/FileList.pm (original)
+++ toys/rsget.pl/RSGet/FileList.pm Mon Jan 11 13:54:57 2010
@@ -187,7 +187,7 @@
my $opt = $decoded{ $uri };
if ( $opt-{getter} ) {
$decoded{ $uri } = [ RSGet::Plugin::from_pkg( 
$opt-{getter} ),
-   $options ];
+   $opt ];
} else {
my $getter = RSGet::Plugin::from_uri( $uri );
if ( $getter ) {
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: libpano12/libpano12.spec - release 2

2010-01-11 Thread hawk
Author: hawk Date: Mon Jan 11 12:55:43 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 2

 Files affected:
packages/libpano12:
   libpano12.spec (1.10 - 1.11) 

 Diffs:


Index: packages/libpano12/libpano12.spec
diff -u packages/libpano12/libpano12.spec:1.10 
packages/libpano12/libpano12.spec:1.11
--- packages/libpano12/libpano12.spec:1.10  Mon May 12 14:20:01 2008
+++ packages/libpano12/libpano12.spec   Mon Jan 11 13:55:38 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8): Panorama Tools - biblioteka do obróbki panoram
 Name:  libpano12
 Version:   2.8.6
-Release:   1
+Release:   2
 License:   GPL
 Group: Libraries
 Source0:   http://dl.sourceforge.net/panotools/%{name}-%{version}.tar.gz
@@ -108,6 +108,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.11  2010/01/11 12:55:38  hawk
+- release 2
+
 Revision 1.10  2008/05/12 12:20:01  patrys
 - package ghost so symlink
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpano12/libpano12.spec?r1=1.10r2=1.11f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: libpano13/libpano13.spec - release 2

2010-01-11 Thread hawk
Author: hawk Date: Mon Jan 11 12:56:02 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 2

 Files affected:
packages/libpano13:
   libpano13.spec (1.2 - 1.3) 

 Diffs:


Index: packages/libpano13/libpano13.spec
diff -u packages/libpano13/libpano13.spec:1.2 
packages/libpano13/libpano13.spec:1.3
--- packages/libpano13/libpano13.spec:1.2   Sat Sep 19 19:37:21 2009
+++ packages/libpano13/libpano13.spec   Mon Jan 11 13:55:57 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8): Panorama Tools - biblioteka do obróbki panoram
 Name:  libpano13
 Version:   2.9.14
-Release:   1
+Release:   2
 License:   GPL
 Group: Libraries
 Source0:   http://dl.sourceforge.net/panotools/%{name}-%{version}.tar.gz
@@ -128,6 +128,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/11 12:55:57  hawk
+- release 2
+
 Revision 1.2  2009/09/19 17:37:21  duddits
 - up to 2.9.14
 - more %files


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpano13/libpano13.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 (DEVEL): gtk-webkit/gtk-webkit.spec (NEW) - development release (1...

2010-01-11 Thread pawelz
Author: pawelz   Date: Mon Jan 11 12:56:12 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- development release (1.1.18)

 Files affected:
packages/gtk-webkit:
   gtk-webkit.spec (NONE - 1.74.2.1)  (NEW)

 Diffs:


Index: packages/gtk-webkit/gtk-webkit.spec
diff -u /dev/null packages/gtk-webkit/gtk-webkit.spec:1.74.2.1
--- /dev/null   Mon Jan 11 13:56:12 2010
+++ packages/gtk-webkit/gtk-webkit.spec Mon Jan 11 13:56:07 2010
@@ -0,0 +1,372 @@
+# $Revision$, $Date$
+# TODO: optflags
+Summary:   Port of WebKit embeddable web component to GTK+
+Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+
+Name:  gtk-webkit
+Version:   1.1.18
+Release:   0.1
+License:   BSD-like
+Group: X11/Libraries
+Source0:   http://webkitgtk.org/webkit-%{version}.tar.gz
+# Source0-md5: 10e52c30837fe0e2ac663fcb4290e1d3
+URL:   http://webkitgtk.org/
+BuildRequires: autoconf = 2.59
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: enchant-devel = 0.22
+BuildRequires: flex
+BuildRequires: fontconfig-devel = 1.0.0
+BuildRequires: glib2-devel = 1:2.22.0
+BuildRequires: gperf
+BuildRequires: gstreamer-devel = 0.10
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: gtk+2-devel = 2:2.10.0
+BuildRequires: gtk-doc = 1.10
+BuildRequires: libicu-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libsoup-devel = 2.28.0
+BuildRequires: libstdc++-devel
+BuildRequires: libtool = 2:1.5
+BuildRequires: libxml2-devel = 1:2.6.30
+BuildRequires: libxslt-devel
+BuildRequires: pkgconfig
+BuildRequires: sqlite3-devel
+BuildRequires: xorg-lib-libXft-devel = 2.0.0
+BuildRequires: xorg-lib-libXt-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+webkit is a port of the WebKit embeddable web component to GTK+.
+
+%description -l pl.UTF-8
+webkit to port osadzalnego komponentu WWW WebKit do GTK+.
+
+%package devel
+Summary:   Development files for webkit
+Summary(pl.UTF-8): Pliki programistyczne webkit
+Group: X11/Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires:  fontconfig-devel = 1.0.0
+Requires:  glib2-devel = 1:2.22.0
+Requires:  gtk+2-devel = 2:2.10.0
+Requires:  libicu-devel
+Requires:  libsoup-devel = 2.28.0
+Requires:  libstdc++-devel
+Requires:  xorg-lib-libXft-devel = 2.0.0
+
+%description devel
+Development files for webkit.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne webkit.
+
+%prep
+%setup -q -n webkit-%{version}
+
+%build
+%{__gtkdocize}
+%{__aclocal} -I autotools
+%{__libtoolize}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure \
+   --enable-dom-storage \
+   --enable-icon-database \
+   --enable-video
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+   DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang webkit
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun-p /sbin/ldconfig
+
+%files -f webkit.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/jsc
+%attr(755,root,root) %{_libdir}/libwebkit-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebkit-1.0.so.2
+%dir %{_datadir}/webkit-1.0
+%{_datadir}/webkit-1.0/images
+%{_datadir}/webkit-1.0/resources
+%{_datadir}/webkit-1.0/webinspector
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwebkit-1.0.so
+%{_libdir}/libwebkit-1.0.la
+%{_includedir}/webkit-1.0
+%{_pkgconfigdir}/webkit-1.0.pc
+
+%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.74.2.1  2010/01/11 12:56:07  pawelz
+- development release (1.1.18)
+
+Revision 1.74  2009/12/30 10:51:44  uzsolt
+- 1.1.15.4
+- rel 1
+
+Revision 1.73  2009/11/12 12:01:04  patrys
+- rebuild
+- rel 2
+
+Revision 1.72  2009/10/23 21:53:48  draenog
+- 1.1.15.3
+- missing R: libicu-devel for devel package
+
+Revision 1.71  2009/10/14 14:34:16  patrys
+- 1.1.15.2
+
+Revision 1.70  2009/09/27 16:58:57  megabajt
+- updated to 1.1.15.1
+
+Revision 1.69  2009/09/23 12:36:38  patrys
+- merged DEVEL
+
+Revision 1.68  2009/09/23 07:15:09  arekm
+- release 2
+
+Revision 1.67  2009/09/22 10:48:22  glen
+- BR: glib-2.0 = 2.21.3
+
+Revision 1.66  2009/09/09 04:35:54  aredridel
+- 1.1.14
+
+Revision 1.65.2.4  2009/09/09 10:43:44  patrys
+- 1.1.14
+
+Revision 1.65.2.3  2009/08/26 08:35:00  patrys
+- 1.1.13
+
+Revision 1.65.2.2  2009/08/08 16:38:47  patrys
+- 1.1.12
+
+Revision 1.65.2.1  2009/07/16 08:30:43  patrys
+- 1.1.11 (stable)
+- requires libsoup from DEVEL
+
+Revision 1.65  2009/07/11 19:55:31  arekm
+- release 2
+
+Revision 1.64  2009/06/28 19:26:32  patrys
+- 1.1.10
+
+Revision 1.63  2009/06/15 09:17:05  patrys
+- 1.1.9
+
+Revision 1.62  2009/05/20 10:14:28  

DISTFILES: webkit-1.1.18.tar.gz

2010-01-11 Thread pawelz

Files fetched: 1

STORED: http://webkitgtk.org/webkit-1.1.18.tar.gz
10e52c30837fe0e2ac663fcb4290e1d3  webkit-1.1.18.tar.gz
Size: 6745038 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: dokuwiki/adldap.patch - full path

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 12:59:19 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- full path

 Files affected:
packages/dokuwiki:
   adldap.patch (1.1 - 1.2) 

 Diffs:


Index: packages/dokuwiki/adldap.patch
diff -u packages/dokuwiki/adldap.patch:1.1 packages/dokuwiki/adldap.patch:1.2
--- packages/dokuwiki/adldap.patch:1.1  Mon Jan 11 13:49:52 2010
+++ packages/dokuwiki/adldap.patch  Mon Jan 11 13:59:14 2010
@@ -5,7 +5,7 @@
   */
  
 -require_once(DOKU_INC.'inc/adLDAP.php');
-+require_once 'adLDAP.php';
++require_once '/usr/share/php/adLDAP.php';
  
  class auth_ad extends auth_basic {
  var $cnf = null;


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/adldap.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: dokuwiki/dokuwiki.spec - adldap optional

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:03:00 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- adldap optional

 Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.70 - 1.71) 

 Diffs:


Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.70 
packages/dokuwiki/dokuwiki.spec:1.71
--- packages/dokuwiki/dokuwiki.spec:1.70Mon Jan 11 13:49:52 2010
+++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 14:02:54 2010
@@ -68,7 +68,7 @@
 %definefind_lang   %{_usrlibrpm}/dokuwiki-find-lang.sh 
%{buildroot}
 
 # bad depsolver
-%define_noautopear 'pear(/usr/share/php/geshi.php)'
+%define_noautopear 'pear(/usr/share/php/geshi.php)' 
'pear(/usr/share/php/adLDAP.php)'
 
 # exclude optional php dependencies
 %define_noautophp  'php(bzip2)' php(zip) php(date) 
php(ftp) php(hash) php(ldap) php(mbstring) php(mysql) php(pgsql) php(tokenizer)
@@ -360,6 +360,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.71  2010/01/11 13:02:54  glen
+- adldap optional
+
 Revision 1.70  2010/01/11 12:49:52  glen
 - use system adldap package
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.70r2=1.71f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: dokuwiki/dokuwiki.spec - bcmath optional

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:13:13 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- bcmath optional

 Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.71 - 1.72) 

 Diffs:


Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.71 
packages/dokuwiki/dokuwiki.spec:1.72
--- packages/dokuwiki/dokuwiki.spec:1.71Mon Jan 11 14:02:54 2010
+++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 14:13:08 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
 Name:  dokuwiki
 Version:   %{ver}
-Release:   0.18
+Release:   0.19
 License:   GPL v2
 Group: Applications/WWW
 Source0:   
http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -71,7 +71,7 @@
 %define_noautopear 'pear(/usr/share/php/geshi.php)' 
'pear(/usr/share/php/adLDAP.php)'
 
 # exclude optional php dependencies
-%define_noautophp  'php(bzip2)' php(zip) php(date) 
php(ftp) php(hash) php(ldap) php(mbstring) php(mysql) php(pgsql) php(tokenizer)
+%define_noautophp  php(bzip2) php(bcmath) php(zip) 
php(date) php(ftp) php(hash) php(ldap) php(mbstring) php(mysql) php(pgsql) 
php(tokenizer)
 
 # we don't want php(xxx) being resolved to php-xxx
 %define_noautoreqdep   '^php(.*)'
@@ -360,6 +360,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.72  2010/01/11 13:13:08  glen
+- bcmath optional
+
 Revision 1.71  2010/01/11 13:02:54  glen
 - adldap optional
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.71r2=1.72f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: dokuwiki/dokuwiki.spec - release 1

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:13:18 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 1

 Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.72 - 1.73) 

 Diffs:


Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.72 
packages/dokuwiki/dokuwiki.spec:1.73
--- packages/dokuwiki/dokuwiki.spec:1.72Mon Jan 11 14:13:08 2010
+++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 14:13:13 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
 Name:  dokuwiki
 Version:   %{ver}
-Release:   0.19
+Release:   1
 License:   GPL v2
 Group: Applications/WWW
 Source0:   
http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -360,6 +360,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.73  2010/01/11 13:13:13  glen
+- release 1
+
 Revision 1.72  2010/01/11 13:13:08  glen
 - bcmath optional
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.72r2=1.73f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec - release 2

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:18:08 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 2

 Files affected:
packages/apache1-mod_auth_ldap:
   apache1-mod_auth_ldap.spec (1.53 - 1.54) 

 Diffs:


Index: packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec
diff -u packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec:1.53 
packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec:1.54
--- packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec:1.53  Mon May 
26 20:46:48 2008
+++ packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.spec   Mon Jan 11 
14:18:03 2010
@@ -24,7 +24,7 @@
 Summary(zh_CN.UTF-8):  这是用于 Apache 的 LDAP 验证模块
 Name:  apache1-mod_%{mod_name}
 Version:   1.6.1
-Release:   0.1
+Release:   2
 License:   BSD
 Group: Networking/Daemons
 Source0:   http://www.rudedog.org/auth_ldap/auth_ldap-%{version}.tar.gz
@@ -174,6 +174,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.54  2010/01/11 13:18:03  glen
+- release 2
+
 Revision 1.53  2008/05/26 18:46:48  glen
 - rel down, as was broken for me
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1-mod_auth_ldap/apache1-mod_auth_ldap.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: ZendFramework/ZendFramework.spec - todo

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:20:08 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- todo

 Files affected:
packages/ZendFramework:
   ZendFramework.spec (1.74 - 1.75) 

 Diffs:


Index: packages/ZendFramework/ZendFramework.spec
diff -u packages/ZendFramework/ZendFramework.spec:1.74 
packages/ZendFramework/ZendFramework.spec:1.75
--- packages/ZendFramework/ZendFramework.spec:1.74  Tue Nov 24 21:39:43 2009
+++ packages/ZendFramework/ZendFramework.spec   Mon Jan 11 14:20:03 2010
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO
+#error: ZendFramework-Zend_Pdf-1.9.6-1: req pear(Zend/Pdf/Excaption.php) not 
found
+#error: ZendFramework-Zend_Pdf-1.9.6-1: req 
pear(Zend/Pdf/FileParser/Image/Jpeg.php) not found
+#error: ZendFramework-Zend_Pdf-1.9.6-1: req 
pear(Zend/Pdf/FileParser/Image/Tiff.php) not found
 %include   /usr/lib/rpm/macros.php
 Summary:   Zend Framework
 Summary(pl.UTF-8): Szkielet Zend
@@ -1738,6 +1742,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.75  2010/01/11 13:20:03  glen
+- todo
+
 Revision 1.74  2009/11/24 20:39:43  adamg
 - updated to 1.9.6
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ZendFramework/ZendFramework.spec?r1=1.74r2=1.75f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/rsget.pl/Get/StorageTo

2010-01-11 Thread sparky
Author: sparky
Date: Mon Jan 11 14:22:16 2010
New Revision: 11103

Modified:
   toys/rsget.pl/Get/StorageTo
Log:
- or not


Modified: toys/rsget.pl/Get/StorageTo
==
--- toys/rsget.pl/Get/StorageTo (original)
+++ toys/rsget.pl/Get/StorageTo Mon Jan 11 14:22:16 2010
@@ -9,7 +9,6 @@
 short: ST
 web: http://storage.to/;
 uri: qr{storage\.to/get/[a-zA-Z0-9]{8}([\?/].*?)?$}
-slots: max
 status: OK 2009-10-23
 
 start:
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: ERRORS: kbluetooth-0.5-1058941.tar.bz2

2010-01-11 Thread lmasko
FATAL: ./upload/lmasko/kbluetooth-0.5-1058941.tar.bz2 was not uploaded

Files fetched: 0



-- 
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: kde4-kdebluetooth/kde4-kdebluetooth.spec - BRs down to versions f...

2010-01-11 Thread lmasko
Author: lmasko   Date: Mon Jan 11 13:30:24 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- BRs down to versions from current Th.
- Builds and works on Th+ready+test.

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.16 - 1.17) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.16 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.17
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.16  Mon Jan 11 
11:14:46 2010
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 14:30:19 2010
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
 
 %defineqtver   4.6.0
-%definekde4ver 4.3.80
+%definekde4ver 4.3.4
 %definesvnsnap 1058941
 %defineorgname kbluetooth
 
 Summary:   KDE Bluetooth framework
 Summary(pl.UTF-8): Podstawowe środowisko KDE Bluetooth
 Name:  kde4-kdebluetooth
-Version:   0.4
+Version:   0.5
 Release:   1.%{svnsnap}.1
 License:   GPL
 Group: X11/Applications
@@ -29,7 +29,7 @@
 BuildRequires: qt4-build = %{qtver}
 BuildRequires: qt4-qmake = %{qtver}
 BuildRequires: shared-desktop-ontologies-devel = 0.2
-BuildRequires: soprano-devel = 2.3.70
+BuildRequires: soprano-devel = 2.3.1
 Requires:  obex-data-server
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,6 +89,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.17  2010/01/11 13:30:19  lmasko
+- BRs down to versions from current Th.
+- Builds and works on Th+ready+test.
+
 Revision 1.16  2010/01/11 10:14:46  shadzik
 - correct BR
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.spec?r1=1.16r2=1.17f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: opensips/opensips.spec - mibs installed to system mibs dir, add m...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 13:38:06 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- mibs installed to system mibs dir, add mibs package; rel 2

 Files affected:
packages/opensips:
   opensips.spec (1.16 - 1.17) 

 Diffs:


Index: packages/opensips/opensips.spec
diff -u packages/opensips/opensips.spec:1.16 
packages/opensips/opensips.spec:1.17
--- packages/opensips/opensips.spec:1.16Fri Aug 28 10:01:51 2009
+++ packages/opensips/opensips.spec Mon Jan 11 14:38:00 2010
@@ -9,12 +9,12 @@
 %bcond_without ldap# LDAP support
 %bcond_withosp # ETSI OSP VoIP Peering support
 %bcond_without geoip   # GeoIP
-#
+
 Summary:   SIP proxy, redirect and registrar server
 Summary(pl.UTF-8): Serwer SIP rejestrujący, przekierowujący i robiący proxy
 Name:  opensips
 Version:   1.5.3
-Release:   1
+Release:   2
 License:   GPL v2
 Group: Networking/Daemons
 Source0:   
http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -25,10 +25,10 @@
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_osp:BuildRequires: OSPToolkit}
 BuildRequires: bison
+BuildRequires: curl-devel
 BuildRequires: expat-devel
 BuildRequires: flex
 %{?with_carrierroute:BuildRequires:libconfuse-devel}
-BuildRequires: curl-devel
 %{?with_pgsql:BuildRequires:   libpqxx-devel}
 BuildRequires: libxml2-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
@@ -138,7 +138,7 @@
 Requires:  %{name} = %{version}-%{release}
 
 %description ldap
-LDAP and H350  modules for openSIPS.
+LDAP and H350 modules for openSIPS.
 
 %description ldap -l pl.UTF-8
 Moduły LDAP i H350 do openSIPS.
@@ -191,16 +191,18 @@
 %description snmpstats -l pl.UTF-8
 Moduł do statystyk SNMP do openSIPS.
 
-%package mibs
+%package -n mibs-%{name}
 Summary:   MIBs for openSIPS
 Summary(pl.UTF-8): MIB-y dla openSIPS
 Group: Applications/System
+Requires:  mibs-dirs
 Requires:  net-snmp-mibs
+Obsoletes: opensips-mibs
 
-%description mibs
+%description -n mibs-%{name}
 MIBs for openSIPS.
 
-%description mibs -l pl.UTF-8
+%description -n mibs-%{name} -l pl.UTF-8
 MIB-y dla openSIPS.
 
 %prep
@@ -255,7 +257,8 @@
prefix=%{_prefix} \
basedir=$RPM_BUILD_ROOT \
cfg-prefix=$RPM_BUILD_ROOT \
-   cfg-target=/etc/opensips/
+   cfg-target=/etc/opensips/ \
+   INSTALLMIBDIR=$RPM_BUILD_ROOT%{_datadir}/mibs
 
 for i in modules/*; do \
i=$(basename $i)
@@ -283,7 +286,7 @@
 
 %post
 /sbin/chkconfig --add opensips
-%service opensips restart sip Daemon
+%service opensips restart SIP Daemon
 
 %preun
 if [ $1 = 0 ]; then
@@ -462,9 +465,9 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/perl.so
 %attr(755,root,root) %{_libdir}/opensips/modules/perlvdb.so
 
-%files mibs
+%files -n mibs-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/snmp/mibs/*
+%{_datadir}/mibs/*
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -472,6 +475,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.17  2010/01/11 13:38:00  glen
+- mibs installed to system mibs dir, add mibs package; rel 2
+
 Revision 1.16  2009/08/28 08:01:51  jajcus
 - Version: 1.5.3
 
@@ -479,7 +485,7 @@
 - Version: 1.5.2
 
 Revision 1.14  2009/04/21 07:21:12  jajcus
-Version: 1.5.1
+- Version: 1.5.1
 
 Revision 1.13  2009/03/30 11:30:41  jajcus
 - Release: 3
@@ -522,4 +528,3 @@
 
 Revision 1.1  2008/08/22 13:19:16  jajcus
 - new spec, based on openser.spec
-


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opensips/opensips.spec?r1=1.16r2=1.17f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: kbluetooth-0.4-1073043.tar.bz2

2010-01-11 Thread lmasko

Files fetched: 1

STORED: no-url://kbluetooth-0.4-1073043.tar.bz2
af24ae1e8d4c6e21170c8183ef48  kbluetooth-0.4-1073043.tar.bz2
Size: 95865 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: kde4-kdebluetooth/kde4-kdebluetooth.spec - Updated svn package.

2010-01-11 Thread lmasko
Author: lmasko   Date: Mon Jan 11 13:49:50 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- Updated svn package.

 Files affected:
packages/kde4-kdebluetooth:
   kde4-kdebluetooth.spec (1.17 - 1.18) 

 Diffs:


Index: packages/kde4-kdebluetooth/kde4-kdebluetooth.spec
diff -u packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.17 
packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.18
--- packages/kde4-kdebluetooth/kde4-kdebluetooth.spec:1.17  Mon Jan 11 
14:30:19 2010
+++ packages/kde4-kdebluetooth/kde4-kdebluetooth.spec   Mon Jan 11 14:49:45 2010
@@ -2,20 +2,20 @@
 
 %defineqtver   4.6.0
 %definekde4ver 4.3.4
-%definesvnsnap 1058941
+%definesvnsnap 1073043
 %defineorgname kbluetooth
 
 Summary:   KDE Bluetooth framework
 Summary(pl.UTF-8): Podstawowe środowisko KDE Bluetooth
 Name:  kde4-kdebluetooth
-Version:   0.5
+Version:   0.4
 Release:   1.%{svnsnap}.1
 License:   GPL
 Group: X11/Applications
 #Source0:  
http://dl.sourceforge.net/kde-bluetooth/%{origname}-%{version}.tar.bz2
 # get via: svn co 
svn://anonsvn.kde.org/home/kde/trunk/playground/network/kbluetooth
 Source0:   %{orgname}-%{version}-%{svnsnap}.tar.bz2
-# Source0-md5: 77ff139629c35bbb17b33f7012b2c02c
+# Source0-md5: af24ae1e8d4c6e21170c8183ef48
 URL:   http://bluetooth.kmobiletools.org/
 BuildRequires: QtCore-devel = %{qtver}
 BuildRequires: QtDBus-devel = %{qtver}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.18  2010/01/11 13:49:45  lmasko
+- Updated svn package.
+
 Revision 1.17  2010/01/11 13:30:19  lmasko
 - BRs down to versions from current Th.
 - Builds and works on Th+ready+test.


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebluetooth/kde4-kdebluetooth.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: phorum/paths.patch - more files

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 14:16:26 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- more files

 Files affected:
packages/phorum:
   paths.patch (1.9 - 1.10) 

 Diffs:


Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.9 packages/phorum/paths.patch:1.10
--- packages/phorum/paths.patch:1.9 Wed Jan  6 19:23:58 2010
+++ packages/phorum/paths.patch Mon Jan 11 15:16:21 2010
@@ -216,3 +216,103 @@
  background-position: 5px 5px;
  background-repeat: no-repeat;
  font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, 
Helvetica;
+--- phorum-5.2.14/htdocs/addon.php 2010-01-11 16:01:43.649536786 +0200
 phorum-5.2.14-paths/htdocs/addon.php   2010-01-11 16:00:14.376410817 
+0200
+@@ -77,6 +77,7 @@
+ 
+ define('phorum_page','addon');
+ 
++chdir(..);
+ include_once( ./common.php );
+ 
+ // Bail out early if there are no modules enabled that implement
+--- phorum-5.2.14/htdocs/ajax.php  2010-01-11 16:01:43.649536786 +0200
 phorum-5.2.14-paths/htdocs/ajax.php2010-01-11 16:00:22.517084899 
+0200
+@@ -24,6 +24,7 @@
+ 
+ define('phorum_page', 'ajax');
+ 
++chdir(..);
+ require_once('./common.php');
+ require_once('./include/api/json.php');
+ 
+--- phorum-5.2.14/htdocs/changes.php   2010-01-11 16:01:44.246269735 +0200
 phorum-5.2.14-paths/htdocs/changes.php 2010-01-11 16:00:26.976419856 
+0200
+@@ -18,6 +18,7 @@
+ 

+ define('phorum_page','changes');
+ 
++chdir(..);
+ include_once(./common.php);
+ include_once(./include/format_functions.php);
+ include_once(./include/diff_patch.php);
+--- phorum-5.2.14/htdocs/css.php   2010-01-11 16:01:43.649536786 +0200
 phorum-5.2.14-paths/htdocs/css.php 2010-01-11 16:00:34.303030241 +0200
+@@ -18,6 +18,7 @@
+ 

+ 
+ define('phorum_page','css');
++chdir(..);
+ require_once('./common.php');
+ 
+ // Set to FALSE to disable CSS compression.
+--- phorum-5.2.14/htdocs/feed.php  2010-01-11 16:01:44.182870087 +0200
 phorum-5.2.14-paths/htdocs/feed.php2010-01-11 16:00:39.736210271 
+0200
+@@ -20,6 +20,7 @@
+ 
+ define(phorum_page, feed);
+ 
++chdir(..);
+ include_once(./common.php);
+ include_once(./include/format_functions.php);
+ include_once(./include/feed_functions.php);
+--- phorum-5.2.14/htdocs/javascript.php2010-01-11 16:01:43.362870559 
+0200
 phorum-5.2.14-paths/htdocs/javascript.php  2010-01-11 16:00:45.322876145 
+0200
+@@ -18,6 +18,7 @@
+ 

+ 
+ define('phorum_page','javascript');
++chdir(..);
+ require_once(./common.php);
+ 
+ // So we can use {URL-HTTP_PATH} in the templates.
+--- phorum-5.2.14/htdocs/pm.php2010-01-11 16:01:43.372872367 +0200
 phorum-5.2.14-paths/htdocs/pm.php  2010-01-11 16:00:55.022939080 +0200
+@@ -32,6 +32,7 @@
+ 
+ define('phorum_page','pm');
+ 
++chdir(..);
+ include_once(./common.php);
+ 
+ phorum_require_login();
+--- phorum-5.2.14/htdocs/redirect.php  2010-01-11 16:01:44.182870087 +0200
 phorum-5.2.14-paths/htdocs/redirect.php2010-01-11 16:01:06.719540737 
+0200
+@@ -24,6 +24,7 @@
+ 
+ define('phorum_page', 'redirect');
+ 
++chdir(..);
+ require_once(./common.php);
+ 
+ if (isset($PHORUM[args][phorum_redirect_to])) {
+--- phorum-5.2.14/htdocs/report.php2010-01-11 16:01:43.366204448 +0200
 phorum-5.2.14-paths/htdocs/report.php  2010-01-11 16:01:09.336206826 
+0200
+@@ -18,6 +18,7 @@
+ 

+ define('phorum_page','report');
+ 
++chdir(..);
+ include_once(./common.php);
+ include_once(./include/email_functions.php);
+ include_once(./include/format_functions.php);
+--- phorum-5.2.14/htdocs/versioncheck.php  2010-01-11 16:01:44.253079929 
+0200
 phorum-5.2.14-paths/htdocs/versioncheck.php2010-01-11 
16:01:11.172873461 +0200
+@@ -24,6 +24,7 @@
+ // so downtime of the phorum.org website won't affect the performance of
+ // the admin interface for Phorum users.
+ 
++chdir(..);
+ require_once('./common.php');
+ 
+ if (isset($_COOKIE[phorum_upgrade_available])) {


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?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


firewall-init: firewall.d/functions - support old and new naming schemes of...

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 14:30:23 2010 GMT
Module: firewall-init Tag: HEAD
 Log message:
- support old and new naming schemes of kernel modules

 Files affected:
firewall-init/firewall.d:
   functions (1.20 - 1.21) 

 Diffs:


Index: firewall-init/firewall.d/functions
diff -u firewall-init/firewall.d/functions:1.20 
firewall-init/firewall.d/functions:1.21
--- firewall-init/firewall.d/functions:1.20 Sat Jan  9 15:14:34 2010
+++ firewall-init/firewall.d/functions  Mon Jan 11 15:30:18 2010
@@ -1,9 +1,46 @@
 #!/bin/sh - keep it for file(1) to get bourne shell script result
 
+__set_modules()
+{
+   local _x _y _z v old_IFS kernelver
+   {
+   read _x _y v _z
+   old_IFS=$IFS
+   IFS='.'
+   set -- $v
+   IFS=$old_IFS
+
+   # strip _* or -* from versions like: 2.6.25_vanilla-1, 
2.6.25-1
+   kernelver=${3%%[-_]*}
+   
+   while [ ${#kernelver} -lt 3 ]; do kernelver=0$kernelver; done
+   kernelver=$2$kernelver
+   while [ ${#kernelver} -lt 6 ]; do kernelver=0$kernelver; done
+   kernelver=$1$kernelver
+   while [ ${#kernelver} -lt 9 ]; do kernelver=0$kernelver; done
+   }  /proc/version
+
+   if [ $kernelver -lt 002006022 ]; then
+   __NAT_MODULES=ip_nat
+   __IP4_CONNTRACK=ip_conntrack
+   __IP6_CONNTRACK=
+   __NF_CONNTRACK=no
+   else
+   __NAT_MODULES=nf_nat
+   __IP4_CONNTRACK=nf_conntrack_ipv4
+   __IP6_CONNTRACK=nf_conntrack_ipv6
+   __NF_CONNTRACK=yes
+   fi
+
+}
+
 generic_load_modules()
 {
local i conn b
 
+   __set_modules
+   is_yes $__NF_CONNTRACK || return
+
_modprobe die -a x_tables
_modprobe die -a nf_conntrack
 
@@ -37,8 +74,9 @@
 {
local i conn b
 
+   __set_modules
_modprobe die -a ip_tables
-   _modprobe die -a nf_conntrack_ipv4
+   _modprobe die -a $__IP4_CONNTRACK
 
if [ $CONNTRACK_MODULES = all -o -z $CONNTRACK_MODULES ] ; then
conn=
@@ -68,10 +106,10 @@
if echo $ipv4_TABLES | awk '!/nat/ {exit 1}' ; then
if [ $NAT_MODULES = all -o -z $NAT_MODULES ] ; then
conn=
-   for i in /lib/modules/`uname 
-r`/kernel/net/ipv4/netfilter/nf_nat_*.ko{.gz,} ; do
+   for i in /lib/modules/`uname 
-r`/kernel/net/ipv4/netfilter/${__NAT_MODULES}_*.ko{.gz,} ; do
if [ -f $i ]; then
for b in $NAT_MODULES_BLACKLIST ; do
-   if [[ $i = */nf_nat_$b.ko* ]]; then
+   if [[ $i = */${__NAT_MODULES}_$b.ko* 
]]; then
i=
break
fi
@@ -86,7 +124,7 @@
elif [ $NAT_MODULES != none ] ; then
conn=
for i in $NAT_MODULES ; do
-   conn=$conn ip_nat_$i
+   conn=$conn ${__NAT_MODULES}_$i
done
_modprobe die -a $conn
fi
@@ -95,8 +133,9 @@
 
 ipv6_load_modules()
 {
+   __set_modules
_modprobe die -a ip6_tables
-   _modprobe die -a nf_conntrack_ipv6
+   [ -n $__IP6_CONNTRACK ]  _modprobe die -a $__IP6_CONNTRACK
 }
 
 generic_remove_modules()
@@ -116,11 +155,12 @@
 {
local modules
 
+   __set_modules
modules=`lsmod | grep ^ipt_ | cut -f 1 -d ' '`
[ -n $modules ]  rmmod $modules
-   modules=`lsmod | grep ^nf_nat_ | cut -f 1 -d ' '`
-   [ -n $modules ]  rmmod $modules
modules=`lsmod | grep ^iptable_ | cut -f 1 -d ' '`
+   [ -n $modules ]  rmmod $modules
+   modules=`lsmod | grep ^${__NAT_MODULES} | cut -f 1 -d ' '`
[ -n $modules ]  rmmod $modules
modules=`lsmod | grep ^ip_conntrack | cut -f 1 -d ' '`
[ -n $modules ]  rmmod $modules


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/firewall.d/functions?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


packages: samba/samba.spec - 3.4.4 - patch samba-client-upcall-buildfix see...

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 14:38:28 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- 3.4.4
- patch samba-client-upcall-buildfix seems obsolete (fixed upstream)

 Files affected:
packages/samba:
   samba.spec (1.472 - 1.473) 

 Diffs:


Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.472 packages/samba/samba.spec:1.473
--- packages/samba/samba.spec:1.472 Thu Dec 24 02:59:54 2009
+++ packages/samba/samba.spec   Mon Jan 11 15:38:22 2010
@@ -52,13 +52,13 @@
 Summary(uk.UTF-8): SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:  samba
-Version:   3.4.3
+Version:   3.4.4
 Release:   1
 Epoch: 1
 License:   GPL v3
 Group: Networking/Daemons
 Source0:   http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 322379680c12057f57685652a35a6b05
+# Source0-md5: 491a1bc9c94ad2f1e6d1c29da271b242
 Source1:   smb.init
 Source2:   %{name}.pamd
 Source3:   swat.inetd
@@ -76,7 +76,6 @@
 Patch3:%{name}-nscd.patch
 Patch4:%{name}-lprng-no-dot-printers.patch
 Patch5:%{name}-python.patch
-Patch6:%{name}-client-upcall-buildfix.patch
 URL:   http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -982,7 +981,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1618,6 +1616,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.473  2010/01/11 14:38:22  baggins
+- 3.4.4
+- patch samba-client-upcall-buildfix seems obsolete (fixed upstream)
+
 Revision 1.472  2009/12/24 01:59:54  mmazur
 - improve avahi bcond
 - add merged_build bcond


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.472r2=1.473f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: phorum/phorum.spec - template subpackages

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 14:40:26 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- template subpackages

 Files affected:
packages/phorum:
   phorum.spec (1.29 - 1.30) 

 Diffs:


Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.29 packages/phorum/phorum.spec:1.30
--- packages/phorum/phorum.spec:1.29Wed Jan  6 19:23:58 2010
+++ packages/phorum/phorum.spec Mon Jan 11 15:40:21 2010
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
+%definethemever5.2
 Summary:   Phorum is a web based message board written in PHP
 Summary(pl.UTF-8): Phorum - implementacja forum WWW w PHP
 Name:  phorum
-Version:   5.2.14
-Release:   0.4
+Version:   %{themever}.14
+Release:   0.7
 License:   Apache-like
 Group: Applications/WWW
 Source0:   http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -16,6 +17,7 @@
 BuildRequires: rpmbuild(macros) = 1.268
 Requires:  webapps
 Requires:  webserver(php) = 4.3.0
+Requires:   %{name}(theme) = %{themever}
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,6 +57,33 @@
 pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
+%package theme-classic
+Summary:Classic theme for Phorum
+Group:  Applications/WWW
+Requires:   %{name} = %{version}-%{release}
+Provides:   %{name}(theme) = %{themever}
+
+%description theme-classic
+Classic theme for Phorum.
+
+%package theme-emerald
+Summary:Emerald theme for Phorum
+Group:  Applications/WWW
+Requires:   %{name} = %{version}-%{release}
+Provides:   %{name}(theme) = %{themever}
+
+%description theme-emerald
+Emerald theme for Phorum.
+
+%package theme-lightweight
+Summary:Lightweight theme for Phorum
+Group:  Applications/WWW
+Requires:   %{name} = %{version}-%{release}
+Provides:   %{name}(theme) = %{themever}
+
+%description theme-lightweight
+Lightweight theme for Phorum.
+
 %prep
 %setup -q
 find '(' -name '*.php' -o -name '*.css' ')' -print0 | xargs -0 %{__sed} -i -e 
's,\r$,,'
@@ -82,9 +111,12 @@
 # samples
 mv portable scripts docs
 
-# TODO: move themes images to htdocs
-#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
-#mv $RPM_BUILD_ROOT%{_appdir}/{,htdocs/}templates/default/images
+# move themes images to htdocs
+for a in templates/*/images; do
+   d=$(dirname $a);
+   install -d htdocs/$d
+   mv $a htdocs/$d
+done
 
 %patch0 -p1
 %patch1 -p1
@@ -95,7 +127,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d 
$RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/htdocs/templates/default,/var/cache/phorum}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},/var/cache/phorum}
 cp -a *.php htdocs include mods templates $RPM_BUILD_ROOT%{_appdir}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -154,7 +186,7 @@
 %{_appdir}/include/cache
 
 %dir %{_appdir}/htdocs
-%{_appdir}/htdocs/templates
+%dir %{_appdir}/htdocs/templates
 %{_appdir}/htdocs/images
 
 %{_appdir}/htdocs/addon.php
@@ -190,12 +222,30 @@
 %{_appdir}/include/admin
 %{_appdir}/include/db/upgrade
 
+%files theme-classic
+%defattr(644,root,root,755)
+%{_appdir}/templates/classic
+%{_appdir}/htdocs/templates/classic
+
+%files theme-emerald
+%defattr(644,root,root,755)
+%{_appdir}/templates/emerald
+%{_appdir}/htdocs/templates/emerald
+
+%files theme-lightweight
+%defattr(644,root,root,755)
+%{_appdir}/templates/lightweight
+%{_appdir}/htdocs/templates/lightweight
+
 %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.30  2010/01/11 14:40:21  glen
+- template subpackages
+
 Revision 1.29  2010/01/06 18:23:58  glen
 - patch after moving files around (easier for further changes)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.29r2=1.30f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: samba-3.4.4.tar.gz samba-vscan-0.3.6c-beta5.tar.gz

2010-01-11 Thread baggins

Files fetched: 1

STORED: http://www.samba.org/samba/ftp/stable/samba-3.4.4.tar.gz
491a1bc9c94ad2f1e6d1c29da271b242  samba-3.4.4.tar.gz
Size: 35378698 bytes
ALREADY GOT: 
http://www.openantivirus.org/download/samba-vscan-0.3.6c-beta5.tar.gz
8f1dd119172e04e6d7c2d05526a4cf8b  samba-vscan-0.3.6c-beta5.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


firewall-init: firewall.d/functions - use printf to make kernel version

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 14:52:22 2010 GMT
Module: firewall-init Tag: HEAD
 Log message:
- use printf to make kernel version

 Files affected:
firewall-init/firewall.d:
   functions (1.21 - 1.22) 

 Diffs:


Index: firewall-init/firewall.d/functions
diff -u firewall-init/firewall.d/functions:1.21 
firewall-init/firewall.d/functions:1.22
--- firewall-init/firewall.d/functions:1.21 Mon Jan 11 15:30:18 2010
+++ firewall-init/firewall.d/functions  Mon Jan 11 15:52:17 2010
@@ -11,13 +11,7 @@
IFS=$old_IFS
 
# strip _* or -* from versions like: 2.6.25_vanilla-1, 
2.6.25-1
-   kernelver=${3%%[-_]*}
-   
-   while [ ${#kernelver} -lt 3 ]; do kernelver=0$kernelver; done
-   kernelver=$2$kernelver
-   while [ ${#kernelver} -lt 6 ]; do kernelver=0$kernelver; done
-   kernelver=$1$kernelver
-   while [ ${#kernelver} -lt 9 ]; do kernelver=0$kernelver; done
+   kernelver=$(printf %.3d%.3d%.3d $1 $2 ${3%%[-_]*})
}  /proc/version
 
if [ $kernelver -lt 002006022 ]; then


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/firewall.d/functions?r1=1.21r2=1.22f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: samba/samba-spoolss-mismerge.patch (NEW) - this part of the commi...

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 15:25:25 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- this part of the commit is missing from 3.4.4 release, looks like mismerge

 Files affected:
packages/samba:
   samba-spoolss-mismerge.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: packages/samba/samba-spoolss-mismerge.patch
diff -u /dev/null packages/samba/samba-spoolss-mismerge.patch:1.1
--- /dev/null   Mon Jan 11 16:25:25 2010
+++ packages/samba/samba-spoolss-mismerge.patch Mon Jan 11 16:25:20 2010
@@ -0,0 +1,108 @@
+From: Günther Deschner g...@samba.org
+Date: Thu, 10 Dec 2009 13:21:12 + (+0100)
+Subject: s4-smbtorture: fix and extend enum printerkey test.
+X-Git-Tag: release-4-0-0alpha11~654
+X-Git-Url: 
http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=ce33967f4a6a762e97a87513df7d33716db689fb
+
+s4-smbtorture: fix and extend enum printerkey test.
+
+Guenther
+---
+
+diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
+index 7468278..0b5f734 100644
+--- a/source4/torture/rpc/spoolss.c
 b/source4/torture/rpc/spoolss.c
+@@ -3352,47 +3352,79 @@ static bool test_EnumPrinterKey(struct torture_context 
*tctx,
+   const char ***array)
+ {
+   struct spoolss_EnumPrinterKey r;
+-  uint32_t needed;
+-  struct spoolss_StringArray2 key_buffer;
+-  uint32_t offered[] = { 0, 512, 1024, 2048 };
++  uint32_t needed = 0;
++  union spoolss_KeyNames key_buffer;
++  int32_t offered[] = { 0, 1, 2, 3, 4, 5, -1, -2, -3, -4, -5, 256, 512, 
1024, 2048 };
++  uint32_t _ndr_size;
+   int i;
+ 
+   r.in.handle = handle;
+   r.in.key_name = key_name;
+   r.out.key_buffer = key_buffer;
+   r.out.needed = needed;
++  r.out._ndr_size = _ndr_size;
+ 
+   for (i=0; i  ARRAY_SIZE(offered); i++) {
+-  r.in.offered = offered[i];
++
++  if (offered[i]  0  needed) {
++  if (needed = 4) {
++  continue;
++  }
++  r.in.offered = needed + offered[i];
++  } else {
++  r.in.offered = offered[i];
++  }
++
++  ZERO_STRUCT(key_buffer);
+ 
+   torture_comment(tctx, Testing EnumPrinterKey(%s) with %d 
offered\n, r.in.key_name, r.in.offered);
+ 
+   torture_assert_ntstatus_ok(tctx, 
dcerpc_spoolss_EnumPrinterKey(p, tctx, r),
+   failed to call EnumPrinterKey);
+   if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
+-  torture_assert(tctx, (key_buffer._ndr_size == 0),
+-  talloc_asprintf(tctx, EnumPrinterKey did not 
return 0 _ndr_size (but %d), windows clients would abort here!, 
key_buffer._ndr_size));
++
++  torture_assert(tctx, (_ndr_size == r.in.offered/2),
++  talloc_asprintf(tctx, EnumPrinterKey size 
mismatch, _ndr_size %d (expected %d),
++  _ndr_size, r.in.offered/2));
++
+   r.in.offered = needed;
+   torture_assert_ntstatus_ok(tctx, 
dcerpc_spoolss_EnumPrinterKey(p, tctx, r),
+   failed to call EnumPrinterKey);
+   }
+-  torture_assert_werr_ok(tctx, r.out.result,
+-  failed to call EnumPrinterKey);
+ 
+-  torture_assert(tctx, (key_buffer._ndr_size * 2 == r.in.offered),
++  if (offered[i]  0) {
++  torture_assert_werr_ok(tctx, r.out.result,
++  failed to call EnumPrinterKey);
++  }
++
++  torture_assert(tctx, (_ndr_size == r.in.offered/2),
+   talloc_asprintf(tctx, EnumPrinterKey size mismatch, 
_ndr_size %d (expected %d),
+-  key_buffer._ndr_size, r.in.offered/2));
++  _ndr_size, r.in.offered/2));
+ 
+   torture_assert(tctx, (*r.out.needed = r.in.offered),
+   talloc_asprintf(tctx, EnumPrinterKey size mismatch: 
needed %d is not = offered %d, *r.out.needed, r.in.offered));
+ 
+-  torture_assert(tctx, (*r.out.needed = key_buffer._ndr_size * 
2),
+-  talloc_asprintf(tctx, EnumPrinterKey size mismatch: 
needed %d is not = _ndr_size %d * 2, *r.out.needed, key_buffer._ndr_size));
++  torture_assert(tctx, (*r.out.needed = _ndr_size * 2),
++  talloc_asprintf(tctx, EnumPrinterKey size mismatch: 
needed %d is not = _ndr_size %d * 2, *r.out.needed, _ndr_size));
+ 
++  if (key_buffer.string_array) {
++  uint32_t calc_needed = 0;
++  int s;
++  for (s=0; key_buffer.string_array[s]; s++) {
++  

packages: samba/samba.spec - fix spoolss.c mismerge

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 15:25:40 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- fix spoolss.c mismerge

 Files affected:
packages/samba:
   samba.spec (1.473 - 1.474) 

 Diffs:


Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.473 packages/samba/samba.spec:1.474
--- packages/samba/samba.spec:1.473 Mon Jan 11 15:38:22 2010
+++ packages/samba/samba.spec   Mon Jan 11 16:25:34 2010
@@ -76,6 +76,7 @@
 Patch3:%{name}-nscd.patch
 Patch4:%{name}-lprng-no-dot-printers.patch
 Patch5:%{name}-python.patch
+Patch6:%{name}-spoolss-mismerge.patch
 URL:   http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -981,6 +982,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1616,6 +1618,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.474  2010/01/11 15:25:34  baggins
+- fix spoolss.c mismerge
+
 Revision 1.473  2010/01/11 14:38:22  baggins
 - 3.4.4
 - patch samba-client-upcall-buildfix seems obsolete (fixed upstream)


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.473r2=1.474f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: cdrkit/cdrkit.spec - release 2

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 15:26:30 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- release 2

 Files affected:
packages/cdrkit:
   cdrkit.spec (1.25 - 1.26) 

 Diffs:


Index: packages/cdrkit/cdrkit.spec
diff -u packages/cdrkit/cdrkit.spec:1.25 packages/cdrkit/cdrkit.spec:1.26
--- packages/cdrkit/cdrkit.spec:1.25Sun Nov 23 20:35:51 2008
+++ packages/cdrkit/cdrkit.spec Mon Jan 11 16:26:24 2010
@@ -7,7 +7,7 @@
 Summary(uk.UTF-8): Програма для запису CD/DVD, яка запускається з 
командної стрічки
 Name:  cdrkit
 Version:   1.1.9
-Release:   1
+Release:   2
 License:   GPL v2
 Group: Applications/System
 Source0:   http://cdrkit.org/releases/%{name}-%{version}.tar.gz
@@ -316,6 +316,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.26  2010/01/11 15:26:24  glen
+- release 2
+
 Revision 1.25  2008/11/23 19:35:51  arekm
 - up to 1.1.9
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrkit/cdrkit.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 (AC-branch): jack-audio-connection-kit/jack-audio-connection-kit.s...

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 15:27:37 2010 GMT
Module: packages  Tag: AC-branch
 Log message:
- release 4

 Files affected:
packages/jack-audio-connection-kit:
   jack-audio-connection-kit.spec (1.71.2.1 - 1.71.2.2) 

 Diffs:


Index: packages/jack-audio-connection-kit/jack-audio-connection-kit.spec
diff -u 
packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.71.2.1 
packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.71.2.2
--- packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.71.2.1  
Tue Oct 16 21:12:16 2007
+++ packages/jack-audio-connection-kit/jack-audio-connection-kit.spec   Mon Jan 
11 16:27:32 2010
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8): JACK - zestaw do połączeń audio
 Name:  jack-audio-connection-kit
 Version:   0.103.0
-Release:   3
+Release:   4
 License:   LGPL v2.1+ (libjack), GPL v2+ (the rest)
 Group: Daemons
 Source0:   http://dl.sourceforge.net/jackit/%{name}-%{version}.tar.gz
@@ -26,14 +26,14 @@
 BuildRequires: automake
 %{?with_apidocs:BuildRequires: doxygen}
 %{?with_cap:BuildRequires: libcap-devel}
-%{?with_freebob:BuildRequires: libfreebob-devel = 1.0.0}
+%{?with_freebob:BuildRequires: libfreebob-devel = 1.0.0}
 BuildRequires: libsndfile-devel = 1.0.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) = 1.98
-Obsoletes: jack-audio-connection-kit-driver-iec61883
 Requires:  %{name}-libs = %{version}-%{release}
+Obsoletes: jack-audio-connection-kit-driver-iec61883
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %definespecflags_ia32  -fomit-frame-pointer -ffast-math
@@ -321,6 +321,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.71.2.2  2010/01/11 15:27:32  glen
+- release 4
+
 Revision 1.71.2.1  2007/10/16 19:12:16  glen
 - alsa subpackage is back; rel 3
 
@@ -575,21 +578,3 @@
 
 Revision 1.1  2002/10/31 12:05:01  qboosh
 - new
-
-* Thu May 23 2002 Fernando Lopez-Lezcano na...@ccrma.stanford.edu
-- added configuration variable to build with/without capabilities
-
-* Tue May 21 2002 Fernando Lopez-Lezcano na...@ccrma.stanford.edu
-- split the examples into a different package so that the base
-  package does not depend on, for example, fltk.
-- disable stripping of binaries
-
-* Mon May 13 2002 Fernando Lopez-Lezcano na...@ccrma.stanford.edu
-- do not compress documentation, added doxygen docs directory
-- changed defattr directives
-- added libdir/jack*, libdir/*.a and libdir/*.so.* to files
-- moved all so's to libs, jack will not start without jack_alsa.so
-- merged base and libs packages
-
-* Sat May  4 2002 Christian Fredrik Kalager Schaller ura...@linuxrising.org
-- initial release of jack sound server package for GStreamer


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jack-audio-connection-kit/jack-audio-connection-kit.spec?r1=1.71.2.1r2=1.71.2.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 (AC-branch): mpd/mpd.spec - release 3

2010-01-11 Thread glen
Author: glen Date: Mon Jan 11 15:30:47 2010 GMT
Module: packages  Tag: AC-branch
 Log message:
- release 3

 Files affected:
packages/mpd:
   mpd.spec (1.7 - 1.7.2.1) 

 Diffs:


Index: packages/mpd/mpd.spec
diff -u packages/mpd/mpd.spec:1.7 packages/mpd/mpd.spec:1.7.2.1
--- packages/mpd/mpd.spec:1.7   Mon Jan  1 22:58:03 2007
+++ packages/mpd/mpd.spec   Mon Jan 11 16:30:42 2010
@@ -10,7 +10,7 @@
 Summary(pl):   Music Player Daemon - demon odtwarzaj�cy muzyk�
 Name:  mpd
 Version:   0.12.1
-Release:   2
+Release:   3
 License:   GPL
 Group: Applications/Multimedia
 Source0:   http://musicpd.org/uploads/files/%{name}-%{version}.tar.bz2
@@ -88,6 +88,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.7.2.1  2010/01/11 15:30:42  glen
+- release 3
+
 Revision 1.7  2007/01/01 21:58:03  sls
 - reenabling support for libao
 - added TODO entry about support for pulseaudio and oggflac


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpd/mpd.spec?r1=1.7r2=1.7.2.1f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: ncmpc/ncmpc.spec - adapterized - build and package lyrics plugins

2010-01-11 Thread evil
Author: evil Date: Mon Jan 11 15:45:22 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- adapterized
- build and package lyrics plugins

 Files affected:
packages/ncmpc:
   ncmpc.spec (1.14 - 1.15) 

 Diffs:


Index: packages/ncmpc/ncmpc.spec
diff -u packages/ncmpc/ncmpc.spec:1.14 packages/ncmpc/ncmpc.spec:1.15
--- packages/ncmpc/ncmpc.spec:1.14  Tue Dec 29 21:23:33 2009
+++ packages/ncmpc/ncmpc.spec   Mon Jan 11 16:45:16 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8): Klient curses dla demona MPD
 Name:  ncmpc
 Version:   0.16
-Release:   1
+Release:   2
 License:   GPL v2+
 Group: Applications/Sound
 Source0:   http://dl.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
@@ -12,9 +12,9 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: glib2-devel
+BuildRequires: libmpdclient-devel
 BuildRequires: libtool
 BuildRequires: ncurses-ext-devel
-BuildRequires: libmpdclient-devel
 Suggests:  mpd
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +43,9 @@
 %{__automake}
 
 %configure \
-   CPPFLAGS=-I/usr/include/ncurses
+   CPPFLAGS=-I/usr/include/ncurses \
+   --enable-lyrics-screen \
+   --with-lyrics-plugin-dir=%{_libdir}/ncmpc/lyrics
 %{__make}
 
 %install
@@ -63,6 +65,9 @@
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README doc/*.sample doc/ncmpc.lirc
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/ncmpc
+%dir %{_libdir}/ncmpc/lyrics
+%attr(755,root,root) %{_libdir}/ncmpc/lyrics/*
 %{_mandir}/man1/ncmpc.*
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -71,6 +76,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15  2010/01/11 15:45:16  evil
+- adapterized
+- build and package lyrics plugins
+
 Revision 1.14  2009/12/29 20:23:33  wiget
 - updated to 0.16
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncmpc/ncmpc.spec?r1=1.14r2=1.15f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: ncmpc/ncmpc.spec - BR: gettext-devel, pkgconfig, rpm-pythonprov

2010-01-11 Thread sparky
Author: sparky   Date: Mon Jan 11 15:56:35 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- BR: gettext-devel, pkgconfig, rpm-pythonprov

 Files affected:
packages/ncmpc:
   ncmpc.spec (1.15 - 1.16) 

 Diffs:


Index: packages/ncmpc/ncmpc.spec
diff -u packages/ncmpc/ncmpc.spec:1.15 packages/ncmpc/ncmpc.spec:1.16
--- packages/ncmpc/ncmpc.spec:1.15  Mon Jan 11 16:45:16 2010
+++ packages/ncmpc/ncmpc.spec   Mon Jan 11 16:56:29 2010
@@ -11,10 +11,13 @@
 URL:   http://mpd.wikia.com/wiki/Client:Ncmpc
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel
 BuildRequires: libmpdclient-devel
 BuildRequires: libtool
 BuildRequires: ncurses-ext-devel
+BuildRequires: pkgconfig
+BuildRequires: rpm-pythonprov
 Suggests:  mpd
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,6 +79,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.16  2010/01/11 15:56:29  sparky
+- BR: gettext-devel, pkgconfig, rpm-pythonprov
+
 Revision 1.15  2010/01/11 15:45:16  evil
 - adapterized
 - build and package lyrics plugins


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncmpc/ncmpc.spec?r1=1.15r2=1.16f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: fet/fet.spec - 5.12.1 - uk translation

2010-01-11 Thread uzsolt
Author: uzsolt   Date: Mon Jan 11 16:13:28 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- 5.12.1
- uk translation

 Files affected:
packages/fet:
   fet.spec (1.41 - 1.42) 

 Diffs:


Index: packages/fet/fet.spec
diff -u packages/fet/fet.spec:1.41 packages/fet/fet.spec:1.42
--- packages/fet/fet.spec:1.41  Wed Dec 16 16:34:20 2009
+++ packages/fet/fet.spec   Mon Jan 11 17:13:23 2010
@@ -7,12 +7,12 @@
 Summary(hu.UTF-8): FET egy nyílt forrású órarend-készítő program
 Summary(pl.UTF-8): Narzędzie do automatycznego układania planów dla szkół 
i uczelni
 Name:  fet
-Version:   5.12.0
+Version:   5.12.1
 Release:   1
 License:   GPL v2
 Group: X11/Applications
 Source0:   
http://www.lalescu.ro/liviu/fet/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 79a04a6b488d27ca3a598e4ac8381faf
+# Source0-md5: f68a8a33e54b52ae5278a68f483d6d87
 URL:   http://www.lalescu.ro/liviu/fet
 BuildRequires: Qt3Support-devel
 BuildRequires: QtCore-devel
@@ -116,6 +116,7 @@
 %lang(ro) %{_datadir}/%{name}/translations/fet_ro.qm
 %lang(ru) %{_datadir}/%{name}/translations/fet_ru.qm
 %lang(tr) %{_datadir}/%{name}/translations/fet_tr.qm
+%lang(uk) %{_datadir}/%{name}/translations/fet_uk.qm
 %{_mandir}/man1/fet.1*
 
 %files examples
@@ -128,6 +129,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.42  2010/01/11 16:13:23  uzsolt
+- 5.12.1
+- uk translation
+
 Revision 1.41  2009/12/16 15:34:20  uzsolt
 - 5.12.0
 - fix doc section


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fet/fet.spec?r1=1.41r2=1.42f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: fet-5.12.1.tar.bz2

2010-01-11 Thread uzsolt

Files fetched: 1

STORED: http://www.lalescu.ro/liviu/fet/download/fet-5.12.1.tar.bz2
f68a8a33e54b52ae5278a68f483d6d87  fet-5.12.1.tar.bz2
Size: 4911947 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: taskcoach/taskcoach.spec - 0.78.0 - remove ppc-specific things

2010-01-11 Thread uzsolt
Author: uzsolt   Date: Mon Jan 11 16:18:29 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- 0.78.0
- remove ppc-specific things

 Files affected:
packages/taskcoach:
   taskcoach.spec (1.33 - 1.34) 

 Diffs:


Index: packages/taskcoach/taskcoach.spec
diff -u packages/taskcoach/taskcoach.spec:1.33 
packages/taskcoach/taskcoach.spec:1.34
--- packages/taskcoach/taskcoach.spec:1.33  Thu Dec 17 23:03:34 2009
+++ packages/taskcoach/taskcoach.spec   Mon Jan 11 17:18:24 2010
@@ -1,15 +1,14 @@
 # $Revision$, $Date$
-# TODO: ppc build fix (syncml support)
 Summary:   Task Coach - simple open source todo manager to manage personal 
tasks and todo lists
 Summary(hu.UTF-8): Task Coach egy egyszerű, nyílt forráskódú 
teendő-nyilvántartó
 Summary(pl.UTF-8): Task Coach - prosty zarządca osobistej listy zadań i 
rzeczy do zrobienia
 Name:  taskcoach
-Version:   0.77.0
+Version:   0.78.0
 Release:   1
 License:   GPL v3
 Group: X11/Applications
 Source0:   http://dl.sourceforge.net/taskcoach/TaskCoach-%{version}.tar.gz
-# Source0-md5: 04ee2efa66c793482b30c09bc56e8580
+# Source0-md5: be9bc5209d236903217b8d9496f565f0
 Patch0:%{name}-desktop.patch
 URL:   http://www.taskcoach.org/
 BuildRequires: python-devel
@@ -124,9 +123,6 @@
 %prep
 %setup -q -n TaskCoach-%{version}
 %patch0 -p1
-%ifarch ppc
-   rm -fv taskcoachlib/bin.in/linux/*.so
-%endif
 
 %build
 %{__python} setup.py build --executable /usr/bin/python
@@ -167,6 +163,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.34  2010/01/11 16:18:24  uzsolt
+- 0.78.0
+- remove ppc-specific things
+
 Revision 1.33  2009/12/17 22:03:34  uzsolt
 - 0.77.0
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/taskcoach/taskcoach.spec?r1=1.33r2=1.34f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: TaskCoach-0.78.0.tar.gz

2010-01-11 Thread uzsolt

Files fetched: 1

STORED: http://dl.sourceforge.net/taskcoach/TaskCoach-0.78.0.tar.gz
be9bc5209d236903217b8d9496f565f0  TaskCoach-0.78.0.tar.gz
Size: 2676615 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: cups/cups.spec - BR: libusb-compact-devel; required by usb.patch

2010-01-11 Thread draenog
Author: draenog  Date: Mon Jan 11 16:38:35 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- BR: libusb-compact-devel; required by usb.patch

 Files affected:
packages/cups:
   cups.spec (1.278 - 1.279) 

 Diffs:


Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.278 packages/cups/cups.spec:1.279
--- packages/cups/cups.spec:1.278   Thu Dec 31 17:44:28 2009
+++ packages/cups/cups.spec Mon Jan 11 17:38:29 2010
@@ -57,6 +57,7 @@
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libusb-devel
+BuildRequires: libusb-compact-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
 %{!?with_gnutls:BuildRequires: openssl-devel}
@@ -744,6 +745,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.279  2010/01/11 16:38:29  draenog
+- BR: libusb-compact-devel; required by usb.patch
+
 Revision 1.278  2009/12/31 16:44:28  cactus
 - rel 5; cups-usb.patch from ubuntu to support both libusb and usblp access
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.278r2=1.279f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: samba/samba-spoolss-mismerge.patch (REMOVED) - it's much more bro...

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 16:44:40 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- it's much more broken than i thought, i can't fix it :(

 Files affected:
packages/samba:
   samba-spoolss-mismerge.patch (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: samba/samba-client-upcall-buildfix.patch (REMOVED) - obsolete

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 16:44:57 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- obsolete

 Files affected:
packages/samba:
   samba-client-upcall-buildfix.patch (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: samba/samba.spec - rel 0.1 - doesn't build, source looks badly gi...

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 16:45:41 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- rel 0.1
- doesn't build, source looks badly git-mismerged

 Files affected:
packages/samba:
   samba.spec (1.474 - 1.475) 

 Diffs:


Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.474 packages/samba/samba.spec:1.475
--- packages/samba/samba.spec:1.474 Mon Jan 11 16:25:34 2010
+++ packages/samba/samba.spec   Mon Jan 11 17:45:36 2010
@@ -53,7 +53,7 @@
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:  samba
 Version:   3.4.4
-Release:   1
+Release:   0.1
 Epoch: 1
 License:   GPL v3
 Group: Networking/Daemons
@@ -76,7 +76,6 @@
 Patch3:%{name}-nscd.patch
 Patch4:%{name}-lprng-no-dot-printers.patch
 Patch5:%{name}-python.patch
-Patch6:%{name}-spoolss-mismerge.patch
 URL:   http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -982,7 +981,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1618,6 +1616,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.475  2010/01/11 16:45:36  baggins
+- rel 0.1
+- doesn't build, source looks badly git-mismerged
+
 Revision 1.474  2010/01/11 15:25:34  baggins
 - fix spoolss.c mismerge
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.474r2=1.475f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


packages: cups/cups.spec - typo

2010-01-11 Thread draenog
Author: draenog  Date: Mon Jan 11 16:47:19 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- typo

 Files affected:
packages/cups:
   cups.spec (1.279 - 1.280) 

 Diffs:


Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.279 packages/cups/cups.spec:1.280
--- packages/cups/cups.spec:1.279   Mon Jan 11 17:38:29 2010
+++ packages/cups/cups.spec Mon Jan 11 17:47:14 2010
@@ -57,7 +57,7 @@
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libusb-devel
-BuildRequires: libusb-compact-devel
+BuildRequires: libusb-compat-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
 %{!?with_gnutls:BuildRequires: openssl-devel}
@@ -745,6 +745,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.280  2010/01/11 16:47:14  draenog
+- typo
+
 Revision 1.279  2010/01/11 16:38:29  draenog
 - BR: libusb-compact-devel; required by usb.patch
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.279r2=1.280f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/stbr/requesters-th.txt

2010-01-11 Thread uzsolt
Author: uzsolt
Date: Mon Jan 11 19:33:47 2010
New Revision: 11104

Modified:
   toys/stbr/requesters-th.txt
Log:
- uzsolt added


Modified: toys/stbr/requesters-th.txt
==
--- toys/stbr/requesters-th.txt (original)
+++ toys/stbr/requesters-th.txt Mon Jan 11 19:33:47 2010
@@ -1 +1 @@
-undefine rotom megabajt wiget adamg wolf mmazur pluto blekot paszczus duddits 
pawelz
+undefine rotom megabajt wiget adamg wolf mmazur pluto blekot paszczus duddits 
pawelz uzsolt
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SVN: toys/rsget.pl/Get/RapidShare

2010-01-11 Thread sparky
Author: sparky
Date: Mon Jan 11 21:35:54 2010
New Revision: 11105

Modified:
   toys/rsget.pl/Get/RapidShare
Log:
- a lot more verbose approach, tell me if you hate it


Modified: toys/rsget.pl/Get/RapidShare
==
--- toys/rsget.pl/Get/RapidShare(original)
+++ toys/rsget.pl/Get/RapidShareMon Jan 11 21:35:54 2010
@@ -1,7 +1,7 @@
 # $Id$
 # Get::RapidShare - File getter plugin for rsget.pl
 #
-# 2009 (c) Przemysław Iskra spa...@pld-linux.org
+# 2009-2010 (c) Przemysław Iskra spa...@pld-linux.org
 #  This program is free software,
 # you may distribute it under GPL v2 or newer.
 
@@ -9,38 +9,67 @@
 short: RS
 web: http://rapidshare.com/;
 uri: qr{(?:rs\d+\.)?rapidshare\.com/files/\d+/.+}
-status: OK 2009-12-12
+status: OK 2010-01-11
+
+pre:
+   sub match($)
+   {
+   my $re = shift;
+   if ( ref $re ) {
+   die Incorrect match regexp
+   unless ref $re eq Regexp;
+   } else {
+   $re = qr/\Q$re\E/;
+   }
+   if ( /.*(.*?$re.*?)/s ) {
+   $_ = $1;
+   s/\r//g;
+   s/\n/ /g;
+   return m/$re/s;
+   } else {
+   return undef;
+   }
+   }
+
 
 start:
GET( $-{_uri} );
 
-   ERROR( file not found )
-   if /The file could not be found\.  Please check the download 
link/;
-   ERROR( file removed ) if /file has been removed from the server|The 
uploader has removed this file from the server/;
-   ERROR( file removed ) if /download of this file is currently not 
possible|This limit is reached/;
+   ERROR( file not found: $_ )
+   if match The file could not be found.  Please check the 
download link.;
+   ERROR( file removed: $_ )
+   if match file has been removed from the server;
+   ERROR( file removed: $_ )
+   if match The uploader has removed this file from the server;
+   ERROR( file removed: $_ )
+   if match download of this file is currently not possible;
+   ERROR( file removed: $_ )
+   if match This limit is reached;
 
-   m#p class=downloadlink.*/(.+?) font style=.*?\| (\d+ 
KB)/font/p#;
+   ! m#p class=downloadlink.*/(.+?) font style=.*?\| (\d+ 
KB)/font/p#;
INFO( name = $1, asize = $2, kilo = 1000 );
 
-   RESTART( $1 * 60, servers overloaded )
-   if /Unfortunately you will have to wait (\d+) minutes,/;
-   
+   RESTART( $1 * 60, servers overloaded: $_ )
+   if match qr/Unfortunately you will have to wait (\d+) minutes/;
+
! my $form = $self-form( id = ff );
CLICK( $form-post() );
 
-   MULTI() if /Please wait until the download is completed/;
+   MULTI( multi-download not allowed: $_ )
+   if match Please wait until the download is completed;
 
# TODO: this should decrease file priority to delay its download,
# postpone it, download after the next file.
-   return $self-problem( No slots for free users )
-   if /There are no more download slots available for free users 
right now/;
-
-   RESTART( $1 * 60 + 10, free limit reached )
-   if /Instant download access! Or try again in about (\d+) 
minutes\./;
-
-   RESTART( $1 * 60, servers overloaded )
-   if /Unfortunately you will have to wait (\d+) minutes,/
-   or /Please try again in (\d+) minutes/;
+   RESTART( -2 * 60, no slots for free users: $_ )
+   if match There are no more download slots available for free 
users right now
+   or match Unfortunately right now our servers are 
overloaded;
+
+   RESTART( $1 * 60 + 10, free limit reached: $_ )
+   if match qr/Instant download access! Or try again in about 
(\d+) minutes/;
+
+   RESTART( $1 * 60, servers overloaded: $_ )
+   if match qr/Unfortunately you will have to wait (\d+) minutes,/
+   or match qr/Please try again in (\d+) minutes/;
 
! $-{form} = $self-form( name = dlf );
$-{form}-set( mirror = on );
@@ -52,6 +81,7 @@
 
CLICK_DOWNLOAD( $-{form}-post() );
 
-   MULTI() if /Please wait until the download is completed/;
+   MULTI( multi-download not allowed: $_ )
+   if match Please wait until the download is completed;
 
 # vim: filetype=perl:ts=4:sw=4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: xdotool-20091231.02.tar.gz

2010-01-11 Thread zbyniu

Files fetched: 1

STORED: http://semicomplete.googlecode.com/files/xdotool-20091231.02.tar.gz
faa6f616d33bdd9ec7fbc0d9542a6cc0  xdotool-20091231.02.tar.gz
Size: 24244 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: xdotool/xdotool.spec - up to 20091231

2010-01-11 Thread zbyniu
Author: zbyniu   Date: Mon Jan 11 20:53:57 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- up to 20091231

 Files affected:
packages/xdotool:
   xdotool.spec (1.2 - 1.3) 

 Diffs:


Index: packages/xdotool/xdotool.spec
diff -u packages/xdotool/xdotool.spec:1.2 packages/xdotool/xdotool.spec:1.3
--- packages/xdotool/xdotool.spec:1.2   Mon Nov 16 22:30:21 2009
+++ packages/xdotool/xdotool.spec   Mon Jan 11 21:53:51 2010
@@ -1,13 +1,13 @@
 # $Revision$, $Date$
-%definerel 20090612
+%definerel 20091231
 Summary:   fake keyboard/mouse input
 Name:  xdotool
 Version:   0
 Release:   0.%{rel}.1
 License:   BSD-like
 Group: X11/Window Managers/Tools
-Source0:   http://semicomplete.googlecode.com/files/%{name}-%{rel}.tar.gz
-# Source0-md5: 78ff810202ed3ae74fd82ec741f889eb
+Source0:   
http://semicomplete.googlecode.com/files/%{name}-%{rel}.02.tar.gz
+# Source0-md5: faa6f616d33bdd9ec7fbc0d9542a6cc0
 URL:   http://www.semicomplete.com/projects/xdotool/
 BuildRequires: perl-tools-pod
 BuildRequires: xorg-lib-libX11-devel
@@ -21,17 +21,20 @@
 X11's XTEST extension and other Xlib functions.
 
 %prep
-%setup -q -n %{name}-%{rel}
+%setup -q -n %{name}-%{rel}.02
 
 %build
-%{__make}
+%{__make} \
+   CC=%{__cc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}}
 
 %{__make} install \
INSTALLBIN=$RPM_BUILD_ROOT%{_bindir} \
+   INSTALLINCLUDE=$RPM_BUILD_ROOT%{_includedir} \
+   INSTALLLIB=$RPM_BUILD_ROOT%{_libdir} \
INSTALLMAN=$RPM_BUILD_ROOT%{_mandir}
 
 %clean
@@ -41,7 +44,9 @@
 %defattr(644,root,root,755)
 %doc COPYRIGHT CHANGELIST README examples
 %attr(755,root,root) %{_bindir}/xdotool
+%attr(755,root,root) %{_libdir}/libxdo*
 %{_mandir}/man1/xdotool.1*
+%{_includedir}/xdo.h
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -49,6 +54,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/11 20:53:51  zbyniu
+- up to 20091231
+
 Revision 1.2  2009/11/16 21:30:21  zbyniu
 - BR: perl-tools-pod, xorg-lib-libXtst-devel
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xdotool/xdotool.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


DISTFILES: phpMyAdmin-3.2.5-all-languages.tar.bz2

2010-01-11 Thread dzeus

Files fetched: 1

STORED: 
http://dl.sourceforge.net/phpmyadmin/phpMyAdmin-3.2.5-all-languages.tar.bz2
6083ea867a152f58f5c332d0c9b92ac1  phpMyAdmin-3.2.5-all-languages.tar.bz2
Size: 2745641 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: phpMyAdmin/phpMyAdmin.spec - up to 3.2.5 (bugfixes)

2010-01-11 Thread dzeus
Author: dzeusDate: Mon Jan 11 21:19:46 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- up to 3.2.5 (bugfixes)

 Files affected:
packages/phpMyAdmin:
   phpMyAdmin.spec (1.223 - 1.224) 

 Diffs:


Index: packages/phpMyAdmin/phpMyAdmin.spec
diff -u packages/phpMyAdmin/phpMyAdmin.spec:1.223 
packages/phpMyAdmin/phpMyAdmin.spec:1.224
--- packages/phpMyAdmin/phpMyAdmin.spec:1.223   Wed Dec  2 22:38:45 2009
+++ packages/phpMyAdmin/phpMyAdmin.spec Mon Jan 11 22:19:40 2010
@@ -4,12 +4,12 @@
 Summary:   phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW
 Name:  phpMyAdmin
-Version:   3.2.4
+Version:   3.2.5
 Release:   1
 License:   GPL v2
 Group: Applications/Databases/Interfaces
 Source0:   
http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5: b927655abd701d8e35079f9e5ec24ee2
+# Source0-md5: 6083ea867a152f58f5c332d0c9b92ac1
 Source1:   %{name}.conf
 Source2:   %{name}-lighttpd.conf
 Patch0:%{name}-config.patch
@@ -158,6 +158,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.224  2010/01/11 21:19:40  dzeus
+- up to 3.2.5 (bugfixes)
+
 Revision 1.223  2009/12/02 21:38:45  dzeus
 - up to 3.2.4 (bugfixes)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpMyAdmin/phpMyAdmin.spec?r1=1.223r2=1.224f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


firewall-init: Makefile, README - 2.99.11 - converted to utf8 - I'm The Man

2010-01-11 Thread baggins
Author: baggins  Date: Mon Jan 11 21:24:57 2010 GMT
Module: firewall-init Tag: HEAD
 Log message:
- 2.99.11
- converted to utf8
- I'm The Man

 Files affected:
firewall-init:
   Makefile (1.9 - 1.10) , README (1.16 - 1.17) 

 Diffs:


Index: firewall-init/Makefile
diff -u firewall-init/Makefile:1.9 firewall-init/Makefile:1.10
--- firewall-init/Makefile:1.9  Wed Dec 30 00:40:48 2009
+++ firewall-init/Makefile  Mon Jan 11 22:24:52 2010
@@ -1,6 +1,6 @@
 
 PACKAGE=firewall-init
-VERSION=2.99.10
+VERSION=2.99.11
 
 initdir=/etc/rc.d/init.d
 sysconfdir=/etc/sysconfig


Index: firewall-init/README
diff -u firewall-init/README:1.16 firewall-init/README:1.17
--- firewall-init/README:1.16   Sat Jan  9 16:18:46 2010
+++ firewall-init/READMEMon Jan 11 22:24:52 2010
@@ -1,6 +1,9 @@
-Originally by Jan R�korajski bagg...@pld-linux.org
-ipv4_ads_killer by Sergiusz Paw�owicz s...@it-zone.org
-Currently mail Mariusz Mazur mma...@kernel.pl
+AUTHORS:
+
+Jan Rękorajski bagg...@pld-linux.org (current maintainer)
+Mariusz Mazur mma...@kernel.pl
+ipv4_ads_killer by Sergiusz Pawłowicz s...@it-zone.org
+trojan_killer by Paweł Gołaszewski bl...@pld-linux.org
 
 PREAMBLE:
 As of version 2.99.0 this package is distributed under GNU GPL, for all


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/Makefile?r1=1.9r2=1.10f=u

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/README?r1=1.16r2=1.17f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: strigi-0.7.1.tar.bz2

2010-01-11 Thread arekm

Files fetched: 1

STORED: http://www.vandenoever.info/software/strigi/strigi-0.7.1.tar.bz2
c60147f5acd53ac5102ed0c972b279fb  strigi-0.7.1.tar.bz2
Size: 936454 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: strigi/strigi.spec - up to 0.7.1

2010-01-11 Thread arekm
Author: arekmDate: Mon Jan 11 21:39:41 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- up to 0.7.1

 Files affected:
packages/strigi:
   strigi.spec (1.35 - 1.36) 

 Diffs:


Index: packages/strigi/strigi.spec
diff -u packages/strigi/strigi.spec:1.35 packages/strigi/strigi.spec:1.36
--- packages/strigi/strigi.spec:1.35Tue Dec  8 08:17:25 2009
+++ packages/strigi/strigi.spec Mon Jan 11 22:39:36 2010
@@ -3,18 +3,18 @@
 # Conditional build:
 %bcond_without dbus# dbus support
 #
-%defineqtver   4.5.2
+%defineqtver   4.6.0
 #%define   _svnver 850421
 
 Summary:   Strigi desktop search
 Summary(pl.UTF-8): System wyszukiwania Strigi
 Name:  strigi
-Version:   0.7.0
-Release:   3
+Version:   0.7.1
+Release:   1
 License:   GPL
 Group: X11/Applications
 Source0:   
http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
-# Source0-md5: 6a6b939a70725d5c77bb69eca347889d
+# Source0-md5: c60147f5acd53ac5102ed0c972b279fb
 URL:   http://strigi.sourceforge.net/
 BuildRequires: QtDBus-devel = %{qtver}
 BuildRequires: QtGui-devel = %{qtver}
@@ -150,6 +150,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.36  2010/01/11 21:39:36  arekm
+- up to 0.7.1
+
 Revision 1.35  2009/12/08 07:17:25  paszczus
 - Qt4.6 isn`t required for now. 4.5.2 is enought; rel 3
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/strigi/strigi.spec?r1=1.35r2=1.36f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: akonadi-1.2.90.tar.bz2

2010-01-11 Thread arekm

Files fetched: 1

STORED: http://download.akonadi-project.org/akonadi-1.2.90.tar.bz2
81b59bb00888dfe58b79fe38e3d936f8  akonadi-1.2.90.tar.bz2
Size: 196119 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): akonadi/akonadi.spec - up to 1.2.90

2010-01-11 Thread arekm
Author: arekmDate: Mon Jan 11 21:44:08 2010 GMT
Module: packages  Tag: DEVEL
 Log message:
- up to 1.2.90

 Files affected:
packages/akonadi:
   akonadi.spec (1.33.2.7 - 1.33.2.8) 

 Diffs:


Index: packages/akonadi/akonadi.spec
diff -u packages/akonadi/akonadi.spec:1.33.2.7 
packages/akonadi/akonadi.spec:1.33.2.8
--- packages/akonadi/akonadi.spec:1.33.2.7  Thu Dec  3 21:30:43 2009
+++ packages/akonadi/akonadi.spec   Mon Jan 11 22:44:03 2010
@@ -4,12 +4,12 @@
 Summary:   Akonadi - The PIM Storage Service
 Summary(pl.UTF-8): Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:  akonadi
-Version:   1.2.80
+Version:   1.2.90
 Release:   1
 License:   GPL v2
 Group: X11/Applications
 Source0:   http://download.akonadi-project.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 86efecca13035df77d2da534cbd0074e
+# Source0-md5: 81b59bb00888dfe58b79fe38e3d936f8
 # svn co svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/
 #Source0:  %{name}-%{version}-%{snap}.tar.bz2
 Patch0:%{name}-mysqlpath.patch
@@ -150,6 +150,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.33.2.8  2010/01/11 21:44:03  arekm
+- up to 1.2.90
+
 Revision 1.33.2.7  2009/12/03 20:30:43  shadzik
 - 1.2.80 (official tarball)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/akonadi/akonadi.spec?r1=1.33.2.7r2=1.33.2.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: cdrtools/cdrtools-config.patch - adjusted for a72

2010-01-11 Thread amateja
Author: amateja  Date: Tue Jan 12 07:18:53 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- adjusted for a72

 Files affected:
packages/cdrtools:
   cdrtools-config.patch (1.11 - 1.12) 

 Diffs:


Index: packages/cdrtools/cdrtools-config.patch
diff -u packages/cdrtools/cdrtools-config.patch:1.11 
packages/cdrtools/cdrtools-config.patch:1.12
--- packages/cdrtools/cdrtools-config.patch:1.11Wed Jan  6 10:14:24 2010
+++ packages/cdrtools/cdrtools-config.patch Tue Jan 12 08:18:47 2010
@@ -101,9 +101,9 @@
  
  .SH FILES
  .TP
--/etc/default/cdrecord
+-.B /etc/default/cdrecord
 -Default values can be set for the following options in /etc/default/cdrecord.
-+/etc/cdrecord.conf
++.B /etc/cdrecord.conf
 +Default values can be set for the following options in /etc/cdrecord.conf .
 +Note that this path has been changed from standard location in cdrtools
 +distribution (/etc/default/cdrecord) to be consistent with other packages
@@ -339,4 +339,4 @@
 +/etc/cdrecord.conf (see FILES section).
  .sp
  .B \h'-2m'Autotarget Mode
- .br
\ No newline at end of file
+ .br


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools-config.patch?r1=1.11r2=1.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: cdrtools/cdrtools.spec - updated to a72

2010-01-11 Thread amateja
Author: amateja  Date: Tue Jan 12 07:19:07 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- updated to a72

 Files affected:
packages/cdrtools:
   cdrtools.spec (1.151 - 1.152) 

 Diffs:


Index: packages/cdrtools/cdrtools.spec
diff -u packages/cdrtools/cdrtools.spec:1.151 
packages/cdrtools/cdrtools.spec:1.152
--- packages/cdrtools/cdrtools.spec:1.151   Sun Jan 10 11:17:37 2010
+++ packages/cdrtools/cdrtools.spec Tue Jan 12 08:19:01 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%definesubver  a71
+%definesubver  a72
 Summary:   A command line CD/DVD-Recorder
 Summary(es.UTF-8): Un programa de grabación de CD/DVD
 Summary(pl.UTF-8): Program do nagrywania płyt CD/DVD
@@ -13,7 +13,7 @@
 License:   GPL v2 (mkisofs), LGPL v2.1 (cdda2wav), CDDL v1.0 (the rest)
 Group: Applications/System
 Source0:   
ftp://ftp.berlios.de/pub/cdrecord/alpha/%{name}-%{version}%{subver}.tar.bz2
-# Source0-md5: 007158667682bfca8d21c15be74543c4
+# Source0-md5: ec285181176341eb73589525c662114e
 Patch0:%{name}-config.patch
 Patch2:%{name}-man.patch
 Patch3:%{name}-make.patch
@@ -388,6 +388,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.152  2010/01/12 07:19:01  amateja
+- updated to a72
+
 Revision 1.151  2010/01/10 10:17:37  arekm
 - rel 2; one scg includes is enough
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools.spec?r1=1.151r2=1.152f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: cdrtools-2.01.01a72.tar.bz2

2010-01-11 Thread amateja

Files fetched: 1

STORED: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a72.tar.bz2
ec285181176341eb73589525c662114e  cdrtools-2.01.01a72.tar.bz2
Size: 1857422 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