SOURCES: munin-node.logrotate (NEW), munin.logrotate - separated c...

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 12:00:44 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- separated configs for client and server

 Files affected:
SOURCES:
   munin-node.logrotate (NONE - 1.1)  (NEW), munin.logrotate (1.2 - 1.3) 

 Diffs:


Index: SOURCES/munin-node.logrotate
diff -u /dev/null SOURCES/munin-node.logrotate:1.1
--- /dev/null   Mon Nov 13 13:00:44 2006
+++ SOURCES/munin-node.logrotateMon Nov 13 13:00:39 2006
@@ -0,0 +1,7 @@
+/var/log/munin/munin-node.log {
+   olddir /var/log/archiv/munin
+   create 640 munin root
+   postrotate
+   /bin/killall -q -HUP munin-node
+   endscript
+}


Index: SOURCES/munin.logrotate
diff -u SOURCES/munin.logrotate:1.2 SOURCES/munin.logrotate:1.3
--- SOURCES/munin.logrotate:1.2 Thu Jan  5 13:17:53 2006
+++ SOURCES/munin.logrotate Mon Nov 13 13:00:39 2006
@@ -1,7 +1,7 @@
-/var/log/munin/* {
+/var/log/munin/munin-graph.log
+/var/log/munin/munin-html.log
+/var/log/munin/munin-limits.log
+/var/log/munin/munin-update.log {
olddir /var/log/archiv/munin
create 640 munin root
-   postrotate
-   /bin/killall -q -HUP munin-node
-   endscript
 }


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin.logrotate?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


SPECS: X11-driver-nvidia.spec - use %build_kernel_modules, %instal...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:17:27 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   X11-driver-nvidia.spec (1.86 - 1.87) 

 Diffs:


Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.86 SPECS/X11-driver-nvidia.spec:1.87
--- SPECS/X11-driver-nvidia.spec:1.86   Fri Nov 10 10:57:38 2006
+++ SPECS/X11-driver-nvidia.specMon Nov 13 13:17:22 2006
@@ -58,7 +58,7 @@
 %endif
 BuildRequires: %{kgcc_package}
 #BuildRequires:X11-devel = %{_min_x11}# disabled for now
-BuildRequires: rpmbuild(macros) = 1.308
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: sed = 4.0
 BuildConflicts:XFree86-nvidia
 Requires:  X11-Xserver
@@ -206,35 +206,7 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   rm -rf o
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%if %{with dist_kernel}
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-   touch o/include/config/MARKER
-   ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o -name nv-kernel.o -o \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
 %endif
 
 %install
@@ -280,14 +252,7 @@
 %endif
 
 %if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp}  %{with dist_kernel}
-install nvidia-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
 %endif
 
 %clean
@@ -385,6 +350,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.87  2006/11/13 12:17:22  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.86  2006/11/10 09:57:38  mguevara
 - up to 1.0.9629-1
 
@@ -768,29 +736,29 @@
 
 Revision 1.29  2002/05/31 20:52:23  filon
 - added missing files (docs and libXvNVIDIA.a)
-- new %%doc
+- new %doc
 
 Revision 1.28  2002/05/29 07:40:32  wiget
-revert last change and add Conflicts: XFree86-OpenGL-devel = 4.2.0-3
+- revert last change and add Conflicts: XFree86-OpenGL-devel = 4.2.0-3
 
 Revision 1.26  2002/05/23 16:35:13  wiget
-2960
+- 2960
 
 Revision 1.25  2002/05/17 09:07:18  wiget
-move libGL.so to main package, release 2
+- move libGL.so to main package, release 2
 
 Revision 1.24  2002/04/08 16:50:23  wiget
-start update to 2880
+- start update to 2880
 
 Revision 1.23  2002/03/11 01:50:59  jack
-Updated to 2802
+- Updated to 2802
 
 Revision 1.22  2002/02/22 23:28:39  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
   Group field using gettext).
 
 Revision 1.21  2002/01/18 02:12:15  kloczek
-perl -pi -e s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/
+- perl -pi -e s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/
 
 Revision 1.20  2002/01/03 23:03:20  gotar
 - s/NVIDIA/nVidia/
@@ -854,7 +822,7 @@
 - added XFree86-Xserver to Requires.
 
 Revision 1.1  2001/02/15 22:50:18  misiek
-renamed
+- renamed
 
 Revision 1.8  2001/01/19 07:44:23  mkochano
 - Updated to 0.9.6.


 CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.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


SPECS: X11-driver-nvidia-legacy.spec - use %build_kernel_modules, ...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:20:01 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.31 - 1.32) 

 Diffs:


Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.31 
SPECS/X11-driver-nvidia-legacy.spec:1.32
--- SPECS/X11-driver-nvidia-legacy.spec:1.31Tue Nov  7 23:21:10 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Mon Nov 13 13:19:56 2006
@@ -190,35 +190,7 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   rm -rf o
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%if %{with dist_kernel}
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-   touch o/include/config/MARKER
-   ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o -name nv-kernel.o -o \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
 %endif
 
 %install
@@ -259,14 +231,7 @@
 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
 
 %if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp}  %{with dist_kernel}
-install nvidia-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
 %endif
 
 %clean
@@ -358,6 +323,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.32  2006/11/13 12:19:56  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.31  2006/11/07 22:21:10  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories 
unexpectedly
 
@@ -640,7 +608,7 @@
 
 Revision 1.51  2004/04/08 10:51:52  pluto
 - merged with kernel-video-nvidia.
-- %%build complaint with 2.6.x.
+- %build complaint with 2.6.x.
 
 Revision 1.50  2004/04/03 22:33:26  gotar
 - s/glibc-tls/glibc(tls)/
@@ -718,7 +686,7 @@
 
 Revision 1.29  2002/05/31 20:52:23  filon
 - added missing files (docs and libXvNVIDIA.a)
-- new %%doc
+- new %doc
 
 Revision 1.28  2002/05/29 07:40:32  wiget
 - revert last change and add Conflicts: XFree86-OpenGL-devel = 4.2.0-3


 CVS-web:

http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.31r2=1.32f=u

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


SPECS: X11-driver-nvidia-legacy.spec - increase rpmbuild(macros) BR

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:21:03 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- increase rpmbuild(macros) BR

 Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.32 - 1.33) 

 Diffs:


Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.32 
SPECS/X11-driver-nvidia-legacy.spec:1.33
--- SPECS/X11-driver-nvidia-legacy.spec:1.32Mon Nov 13 13:19:56 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Mon Nov 13 13:20:58 2006
@@ -36,7 +36,7 @@
 BuildRequires: %{kgcc_package}
 #BuildRequires:X11-devel = %{_min_x11}# disabled for now
 %{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.7}
-BuildRequires: rpmbuild(macros) = 1.213
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: sed = 4.0
 BuildConflicts:XFree86-nvidia
 Requires:  X11-Xserver
@@ -323,6 +323,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.33  2006/11/13 12:20:58  sparky
+- increase rpmbuild(macros) BR
+
 Revision 1.32  2006/11/13 12:19:56  sparky
 - use %build_kernel_modules, %install_kernel_modules (not tested)
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.32r2=1.33f=u

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


SPECS: openct.spec - updated to 0.6.10

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 12:21:22 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 0.6.10

 Files affected:
SPECS:
   openct.spec (1.28 - 1.29) 

 Diffs:


Index: SPECS/openct.spec
diff -u SPECS/openct.spec:1.28 SPECS/openct.spec:1.29
--- SPECS/openct.spec:1.28  Mon Sep 25 13:42:32 2006
+++ SPECS/openct.spec   Mon Nov 13 13:21:16 2006
@@ -3,12 +3,12 @@
 Summary:   OpenCT library - library for accessing smart card terminals
 Summary(pl):   OpenCT - biblioteka dostępu do terminali kart procesorowych
 Name:  openct
-Version:   0.6.9
+Version:   0.6.10
 Release:   1
 License:   LGPL
 Group: Applications
 Source0:   
http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz
-# Source0-md5: 26c7f8d9fabbd698303601cc7d844252
+# Source0-md5: fc91a7cda636b0dc5de74f1d22c2d914
 Source1:   %{name}.init
 URL:   http://www.opensc-project.org/openct/
 BuildRequires: autoconf = 2.52
@@ -182,6 +182,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.29  2006/11/13 12:21:16  qboosh
+- updated to 0.6.10
+
 Revision 1.28  2006/09/25 11:42:32  qboosh
 - updated to 0.6.9
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/openct.spec?r1=1.28r2=1.29f=u

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


DISTFILES: openct-0.6.10.tar.gz

2006-11-13 Thread qboosh

Files fetched: 1

STORED: http://www.opensc-project.org/files/openct/openct-0.6.10.tar.gz
fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz
Size: 670693 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


SVN: admin/dns/pld-linux.org.template

2006-11-13 Thread adamg
Author: adamg
Date: Mon Nov 13 13:21:43 2006
New Revision: 7978

Modified:
   admin/dns/pld-linux.org.template
Log:
- ns1 restored


Modified: admin/dns/pld-linux.org.template
==
--- admin/dns/pld-linux.org.template(original)
+++ admin/dns/pld-linux.org.templateMon Nov 13 13:21:43 2006
@@ -1,7 +1,7 @@
 $TTL 30m
 $ORIGIN .
 pld-linux.org  IN SOA  ns1.pld-linux.org. hostmaster.pld-linux.org. (
-   2006111301 ; serial
+   2006111302 ; serial
1h ; refresh
30m; retry
7d ; expire
@@ -196,6 +196,7 @@
 livecd CNAME   livecd.pl.
 ftp.livecd A   194.29.174.26
 
-ns1A   217.149.246.4
+;ns1   A   217.149.246.4
+ns1A   87.236.194.82
 ns2A   193.0.95.187
 ns3A   193.0.95.165
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SPECS: xorg-driver-video-nvidia.spec - use %build_kernel_modules, ...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:24:07 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.83 - 1.84) 

 Diffs:


Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.83 
SPECS/xorg-driver-video-nvidia.spec:1.84
--- SPECS/xorg-driver-video-nvidia.spec:1.83Wed Nov  8 22:26:47 2006
+++ SPECS/xorg-driver-video-nvidia.spec Mon Nov 13 13:24:02 2006
@@ -52,7 +52,7 @@
 %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.7}
 %endif
 BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) = 1.308
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: sed = 4.0
 BuildConflicts:XFree86-nvidia
 Requires:  xorg-xserver-server
@@ -191,35 +191,7 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%if %{with dist_kernel}
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-   install -d o/include/config
-   touch o/include/config/MARKER
-   ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o -name nv-kernel.o -o \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
 %endif
 
 %install
@@ -262,14 +234,7 @@
 %endif
 
 %if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp}  %{with dist_kernel}
-install nvidia-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
 %endif
 
 %clean
@@ -359,6 +324,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.84  2006/11/13 12:24:02  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.83  2006/11/08 21:26:47  aflinta
 - up to official release 9629, it's not beta but xgl doesn't work for me
 
@@ -388,7 +356,7 @@
 - xinitrc for loading nvidia settings on startup
 
 Revision 1.74  2006/08/24 21:56:48  aflinta
- - version 8774, working with xorg 7.1
+- version 8774, working with xorg 7.1
 
 Revision 1.73  2006/08/24 14:47:50  adamg
 - alt_kernel support
@@ -403,9 +371,9 @@
 - version 8762
 
 Revision 1.69  2006/05/01 11:51:45  aflinta
- - added nvidia-xconfig, man pages, html docs
- - added desktp shortcut for nvidia-settings
- - release 0.2
+- added nvidia-xconfig, man pages, html docs
+- added desktp shortcut for nvidia-settings
+- release 0.2
 
 Revision 1.68  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
@@ -414,8 +382,8 @@
 - R: xorg-xserver-server
 
 Revision 1.66  2006/04/09 11:01:00  aflinta
- - added fixes from Lukasz Krotowski
- - updated to version 8756
+- added fixes from Lukasz Krotowski
+- updated to version 8756
 
 Revision 1.65  2006/03/24 21:23:32  aflinta
 - it provides OpenGL, drop X11 requirements, need some work with xorg 
dependency
@@ -646,7 +614,7 @@
 
 Revision 1.51  2004/04/08 10:51:52  pluto
 - merged with kernel-video-nvidia.
-- %%build complaint with 2.6.x.
+- %build complaint with 2.6.x.
 
 Revision 1.50  2004/04/03 22:33:26  gotar
 - s/glibc-tls/glibc(tls)/
@@ -724,29 +692,29 @@
 
 Revision 1.29  2002/05/31 20:52:23  filon
 - added missing files (docs and libXvNVIDIA.a)
-- new %%doc
+- new %doc
 
 Revision 1.28  2002/05/29 07:40:32  wiget
-revert last change and add Conflicts: XFree86-OpenGL-devel = 4.2.0-3
+- revert last change and add Conflicts: XFree86-OpenGL-devel = 4.2.0-3
 
 Revision 1.26  2002/05/23 16:35:13  wiget
-2960
+- 2960
 
 Revision 1.25  2002/05/17 09:07:18  wiget
-move libGL.so to main package, release 2
+- move libGL.so to main package, release 2
 
 Revision 1.24  2002/04/08 16:50:23  wiget
-start update to 2880
+- start update to 2880
 
 Revision 1.23  2002/03/11 01:50:59  jack

SPECS: xorg-driver-video-nvidia-legacy.spec - %{_alt_kernel} suppo...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:27:18 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.7 - 1.8) 

 Diffs:


Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.7 
SPECS/xorg-driver-video-nvidia-legacy.spec:1.8
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.7  Wed Nov  1 17:06:08 2006
+++ SPECS/xorg-driver-video-nvidia-legacy.spec  Mon Nov 13 13:27:13 2006
@@ -32,9 +32,9 @@
 URL:   http://www.nvidia.com/object/linux.html
 BuildConflicts:XFree86-nvidia
 BuildRequires: grep
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 2.6.7}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
2.6.7}
 BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) = 1.213
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: sed = 4.0
 BuildRequires: textutils
 #BuildRequires:X11-devel = %{_min_x11}# disabled for now
@@ -112,7 +112,7 @@
 %description progs -l pl
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
-%package -n kernel-video-nvidia
+%package -n kernel%{_alt_kernel}-video-nvidia
 Summary:   nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Moduł jądra dla obsługi kart graficznych nVidia
@@ -125,17 +125,17 @@
 Provides:  X11-driver-nvidia(kernel)
 Obsoletes: XFree86-nvidia-kernel
 
-%description -n kernel-video-nvidia
+%description -n kernel%{_alt_kernel}-video-nvidia
 nVidia Architecture support for Linux kernel.
 
-%description -n kernel-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 
-%description -n kernel-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla XFree86 4.
 
-%package -n kernel-smp-video-nvidia
+%package -n kernel%{_alt_kernel}-smp-video-nvidia
 Summary:   nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Moduł jądra dla obsługi kart graficznych nVidia
@@ -147,13 +147,13 @@
 Provides:  X11-driver-nvidia(kernel)
 Obsoletes: XFree86-nvidia-kernel
 
-%description -n kernel-smp-video-nvidia
+%description -n kernel%{_alt_kernel}-smp-video-nvidia
 nVidia Architecture support for Linux kernel SMP.
 
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
 
-%description -n kernel-smp-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl
 Obsługa architektury nVidia dla jądra Linuksa SMP. Pakiet wymagany
 przez sterownik nVidii dla XFree86 4.
 
@@ -178,30 +178,7 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   rm -rf include
-   install -d include/{linux,config}
-   ln -sf %{_kernelsrcdir}/config-$cfg .config
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
include/linux/autoconf.h
-   ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-   touch include/config/MARKER
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o -name nv-kernel.o -o \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD \
-   M=$PWD O=$PWD \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD \
-   M=$PWD O=$PWD \
-   %{?with_verbose:V=1}
-   mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
 %endif
 
 %install
@@ -239,14 +216,7 @@
 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
 
 %if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp}  %{with dist_kernel}
-install nvidia-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
 %endif
 
 %clean
@@ -269,16 +239,16 @@
 
 %postun-p /sbin/ldconfig
 
-%post  -n kernel-video-nvidia
+%post  -n 

SPECS: qemu.spec - %{_alt_kernel} support - use %build_kernel_modu...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:38:15 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   qemu.spec (1.61 - 1.62) 

 Diffs:


Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.61 SPECS/qemu.spec:1.62
--- SPECS/qemu.spec:1.61Mon Nov 13 00:35:03 2006
+++ SPECS/qemu.spec Mon Nov 13 13:38:10 2006
@@ -42,10 +42,10 @@
 BuildRequires: alsa-lib-devel
 %{!?with_gcc4:BuildRequires:   gcc  5:4.0}
 %if %{with kqemu}  %{with dist_kernel}
-BuildRequires: kernel-module-build = 3:2.6.7
+BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.7
 %endif
 BuildRequires: perl-tools-pod
-BuildRequires: rpmbuild(macros) = 1.217
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: tetex
 BuildRequires: sed = 4.0
 Requires:  SDL = 1.2.1
@@ -87,7 +87,7 @@
   używane do wirtualnego hostowania kilku wirtualnych pecetów na
   pojedynczym serwerze.
 
-%package -n kernel-misc-kqemu
+%package -n kernel%{_alt_kernel}-misc-kqemu
 Summary:   kqemu - kernel module
 Summary(pl):   kqemu - moduł jądra
 Version:   %{_kqemu_version}
@@ -98,13 +98,13 @@
 Requires(post,postun): /sbin/depmod
 Requires:  module-init-tools = 3.2.2-2
 
-%description -n kernel-misc-kqemu
+%description -n kernel%{_alt_kernel}-misc-kqemu
 kqemu - kernel module.
 
-%description -n kernel-misc-kqemu -l pl
+%description -n kernel%{_alt_kernel}-misc-kqemu -l pl
 kqemu - moduł jądra.
 
-%package -n kernel-smp-misc-kqemu
+%package -n kernel%{_alt_kernel}-smp-misc-kqemu
 Summary:   kqemu - SMP kernel module
 Summary(pl):   kqemu - moduł jądra SMP
 Version:   %{_kqemu_version}
@@ -115,10 +115,10 @@
 Requires(post,postun): /sbin/depmod
 Requires:  module-init-tools = 3.2.2-2
 
-%description -n kernel-smp-misc-kqemu
+%description -n kernel%{_alt_kernel}-smp-misc-kqemu
 kqemu - SMP kernel module.
 
-%description -n kernel-smp-misc-kqemu -l pl
+%description -n kernel%{_alt_kernel}-smp-misc-kqemu -l pl
 kqemu - moduł jądra SMP.
 
 %prep
@@ -163,34 +163,14 @@
 %if %{with kernel}
 cd kqemu-%{_kqemu_version}
 mv -f kqemu-linux.c{,.orig}
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%if %{with dist_kernel}
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-   install -d o/include/config
-   touch o/include/config/MARKER
-   ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-   if grep -q ^CONFIG_PREEMPT_RT=y$ o/.config; then
-   sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \
-   kqemu-linux.c.orig  kqemu-linux.c
-   else
-   cat kqemu-linux.c.orig  kqemu-linux.c
-   fi
-
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv kqemu.ko kqemu-mod-$cfg.ko
-done
+%build_kernel_modules -m kqemu 'EOF'
+if grep -q CONFIG_PREEMPT_RT$ o/.config; then
+   sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \
+   kqemu-linux.c.orig  kqemu-linux.c
+else
+   cat kqemu-linux.c.orig  kqemu-linux.c
+fi
+EOF
 cd -
 %endif
 
@@ -232,12 +212,10 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+%install_kernel_modules -m kqemu-%{_kqemu_version}/kqemu -d misc
 install -d $RPM_BUILD_ROOT/etc/{modprobe.d/%{_kernel_ver}{,smp},udev/rules.d}
-install kqemu-%{_kqemu_version}/kqemu-mod-up.ko 
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/kqemu.ko
 install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/kqemu.conf
 %if %{with smp}  %{with dist_kernel}
-install kqemu-%{_kqemu_version}/kqemu-mod-smp.ko 
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/kqemu.ko
 install modprobe.conf 
$RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}smp/kqemu.conf
 %endif
 install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/kqemu.rules
@@ -257,16 +235,16 @@
 EOF
 %endif
 
-%post  -n kernel-misc-kqemu
+%post  -n kernel%{_alt_kernel}-misc-kqemu
 %depmod %{_kernel_ver}
 
-%postun -n kernel-misc-kqemu
+%postun -n kernel%{_alt_kernel}-misc-kqemu
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-misc-kqemu
+%post  -n kernel%{_alt_kernel}-smp-misc-kqemu
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-kqemu
+%postun -n kernel%{_alt_kernel}-smp-misc-kqemu
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -281,7 +259,7 @@
 %endif
 
 %if %{with kernel}
-%files -n 

SPECS: X11-driver-firegl.spec - use %build_kernel_modules, %instal...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:42:01 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   X11-driver-firegl.spec (1.133 - 1.134) 

 Diffs:


Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.133 SPECS/X11-driver-firegl.spec:1.134
--- SPECS/X11-driver-firegl.spec:1.133  Thu Nov  2 14:46:16 2006
+++ SPECS/X11-driver-firegl.specMon Nov 13 13:41:56 2006
@@ -43,7 +43,7 @@
 #BuildRequires:X11-devel = %{_min_eq_x11} # disabled for now
 %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.14}
 %{?with_userspace:BuildRequires:   qt-devel}
-BuildRequires: rpmbuild(macros) = 1.308
+BuildRequires: rpmbuild(macros) = 1.326
 Requires:  X11-OpenGL-core = %{_min_eq_x11}
 Requires:  X11-Xserver
 %{?with_kernel:Requires:   X11-driver-firegl(kernel)}
@@ -135,24 +135,7 @@
 %if %{with kernel}
 cd common/lib/modules/fglrx/build_mod
 cp -f 2.6.x/Makefile .
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv fglrx{,-$cfg}.ko
-done
+%build_kernel_modules -m fglrx
 cd -
 %endif
 
@@ -169,16 +152,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-cd common/lib/modules/fglrx/build_mod
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fglrx.ko
-%if %{with smp}  %{with dist_kernel}
-install fglrx-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fglrx.ko
-%endif
-cd -
+%install_kernel_modules -m common/lib/modules/fglrx/build_mod/fglrx -d misc
 %endif
 
 %if %{with userspace}
@@ -267,6 +241,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.134  2006/11/13 12:41:56  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.133  2006/11/02 13:46:16  matkor
 - Now builds on @2.6.18.1_4
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.133r2=1.134f=u

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


SPECS: xorg-driver-video-fglrx.spec - %{_alt_kernel} support - use...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 12:45:59 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules (not tested)

 Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.17 - 1.18) 

 Diffs:


Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.17 
SPECS/xorg-driver-video-fglrx.spec:1.18
--- SPECS/xorg-driver-video-fglrx.spec:1.17 Thu Oct 12 22:17:58 2006
+++ SPECS/xorg-driver-video-fglrx.spec  Mon Nov 13 13:45:53 2006
@@ -37,9 +37,9 @@
 Patch3:%{name}-viak8t.patch
 URL:   http://www.ati.com/support/drivers/linux/radeon-linux.html
 %{?with_userspace:BuildRequires:   OpenGL-GLU-devel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.14}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.14}
 %{?with_userspace:BuildRequires:   qt-devel}
-BuildRequires: rpmbuild(macros) = 1.213
+BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
 BuildRequires: xorg-proto-recordproto-devel
@@ -100,7 +100,7 @@
 Biblioteki statyczne do programowania z użyciem własnościowego
 sterownika ATI dla kart graficznych ATI Radeon.
 
-%package -n kernel-video-firegl
+%package -n kernel%{_alt_kernel}-video-firegl
 Summary:   ATI kernel module for FireGL support
 Summary(pl):   Moduł jądra oferujący wsparcie dla ATI FireGL
 Release:   [EMAIL PROTECTED]
@@ -110,13 +110,13 @@
 Requires(post,postun): /sbin/depmod
 Provides:  xorg-driver-video-fglrx(kernel)
 
-%description -n kernel-video-firegl
+%description -n kernel%{_alt_kernel}-video-firegl
 ATI kernel module for FireGL support.
 
-%description -n kernel-video-firegl -l pl
+%description -n kernel%{_alt_kernel}-video-firegl -l pl
 Moduł jądra oferujący wsparcie dla ATI FireGL.
 
-%package -n kernel-smp-video-firegl
+%package -n kernel%{_alt_kernel}-smp-video-firegl
 Summary:   ATI kernel module for FireGL support
 Summary(pl):   Moduł jądra oferujący wsparcie dla ATI FireGL
 Release:   [EMAIL PROTECTED]
@@ -126,10 +126,10 @@
 Requires(post,postun): /sbin/depmod
 Provides:  xorg-driver-video-fglrx(kernel)
 
-%description -n kernel-smp-video-firegl
+%description -n kernel%{_alt_kernel}-smp-video-firegl
 ATI kernel module for FireGL support.
 
-%description -n kernel-smp-video-firegl -l pl
+%description -n kernel%{_alt_kernel}-smp-video-firegl -l pl
 Moduł jądra oferujący wsparcie dla ATI FireGL.
 
 %prep
@@ -157,24 +157,7 @@
 %if %{with kernel}
 cd common/lib/modules/fglrx/build_mod
 cp -f 2.6.x/Makefile .
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv fglrx{,-$cfg}.ko
-done
+%build_kernel_modules -m fglrx
 cd -
 %endif
 
@@ -191,16 +174,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-cd common/lib/modules/fglrx/build_mod
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fglrx.ko
-%if %{with smp}  %{with dist_kernel}
-install fglrx-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fglrx.ko
-%endif
-cd -
+%install_kernel_modules -m common/lib/modules/fglrx/build_mod/fglrx -d misc
 %endif
 
 %if %{with userspace}
@@ -232,16 +206,16 @@
 %post  -p /sbin/ldconfig
 %postun-p /sbin/ldconfig
 
-%post  -n kernel-video-firegl
+%post  -n kernel%{_alt_kernel}-video-firegl
 %depmod %{_kernel_ver}
 
-%postun -n kernel-video-firegl
+%postun -n kernel%{_alt_kernel}-video-firegl
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-video-firegl
+%post  -n kernel%{_alt_kernel}-smp-video-firegl
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-video-firegl
+%postun -n kernel%{_alt_kernel}-smp-video-firegl
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -276,12 +250,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-video-firegl
+%files -n kernel%{_alt_kernel}-video-firegl
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
 %if %{with smp}  %{with 

SOURCES: mpt-status-headers.patch - updated from 2.6.16.29

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 13:26:31 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated from 2.6.16.29

 Files affected:
SOURCES:
   mpt-status-headers.patch (1.1 - 1.2) 

 Diffs:


Index: SOURCES/mpt-status-headers.patch
diff -u SOURCES/mpt-status-headers.patch:1.1 
SOURCES/mpt-status-headers.patch:1.2
--- SOURCES/mpt-status-headers.patch:1.1Mon Aug  8 12:57:16 2005
+++ SOURCES/mpt-status-headers.patchMon Nov 13 14:26:25 2006
@@ -1,16 +1,16 @@
-diff -Nur mpt-status-1.0/include.orig/lsi/mpi_cnfg.h 
mpt-status-1.0/include/lsi/mpi_cnfg.h
 mpt-status-1.0/include.orig/lsi/mpi_cnfg.h 1970-01-01 01:00:00.0 
+0100
-+++ mpt-status-1.0/include/lsi/mpi_cnfg.h  2004-08-08 01:26:04.0 
+0200
-@@ -0,0 +1,2105 @@
+diff -Nur mpt-status-1.2.0/include.orig/lsi/mpi_cnfg.h 
mpt-status-1.2.0/include/lsi/mpi_cnfg.h
+--- mpt-status-1.2.0/include.orig/lsi/mpi_cnfg.h   1970-01-01 
01:00:00.0 +0100
 mpt-status-1.2.0/include/lsi/mpi_cnfg.h2006-11-13 14:00:03.939505000 
+0100
+@@ -0,0 +1,2837 @@
 +/*
-+ *  Copyright (c) 2000-2003 LSI Logic Corporation.
++ *  Copyright (c) 2000-2005 LSI Logic Corporation.
 + *
 + *
 + *   Name:  mpi_cnfg.h
 + *  Title:  MPI Config message, structures, and Pages
 + *  Creation Date:  July 27, 2000
 + *
-+ *mpi_cnfg.h Version:  01.05.xx
++ *mpi_cnfg.h Version:  01.05.11
 + *
 + *  Version History
 + *  ---
@@ -149,6 +149,127 @@
 + *  In CONFIG_PAGE_FC_DEVICE_0, replaced Reserved1 field
 + *  with ADISCHardALPA.
 + *  Added MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY define.
++ *  01-16-04 01.02.13   Added InitiatorDeviceTimeout and 
InitiatorIoPendTimeout
++ *  fields and related defines to CONFIG_PAGE_FC_PORT_1.
++ *  Added define for
++ *  MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK.
++ *  Added new fields to the substructures of
++ *  CONFIG_PAGE_FC_PORT_10.
++ *  04-29-04 01.02.14   Added define for IDP bit for CONFIG_PAGE_SCSI_PORT_0,
++ *  CONFIG_PAGE_SCSI_DEVICE_0, and
++ *  CONFIG_PAGE_SCSI_DEVICE_1. Also bumped Page Version 
for
++ *  these pages.
++ *  05-11-04 01.03.01   Added structure for CONFIG_PAGE_INBAND_0.
++ *  08-19-04 01.05.01   Modified MSG_CONFIG request to support extended config
++ *  pages.
++ *  Added a new structure for extended config page header.
++ *  Added new extended config pages types and structures 
for
++ *  SAS IO Unit, SAS Expander, SAS Device, and SAS PHY.
++ *  Replaced a reserved byte in 
CONFIG_PAGE_MANUFACTURING_4
++ *  to add a Flags field.
++ *  Two new Manufacturing config pages (5 and 6).
++ *  Two new bits defined for IO Unit Page 1 Flags field.
++ *  Modified CONFIG_PAGE_IO_UNIT_2 to add three new fields
++ *  to specify the BIOS boot device.
++ *  Four new Flags bits defined for IO Unit Page 2.
++ *  Added IO Unit Page 4.
++ *  Added EEDP Flags settings to IOC Page 1.
++ *  Added new BIOS Page 1 config page.
++ *  10-05-04 01.05.02   Added define for
++ *  MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE.
++ *  Added new Flags field to CONFIG_PAGE_MANUFACTURING_5 
and
++ *  associated defines.
++ *  Added more defines for SAS IO Unit Page 0
++ *  DiscoveryStatus field.
++ *  Added define for MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK
++ *  and MPI_SAS_IOUNIT0_DS_TABLE_LINK.
++ *  Added defines for Physical Mapping Modes to SAS IO 
Unit
++ *  Page 2.
++ *  Added define for
++ *  MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH.
++ *  10-27-04 01.05.03   Added defines for new SAS PHY page addressing mode.
++ *  Added defines for MaxTargetSpinUp to BIOS Page 1.
++ *  Added 5 new ControlFlags defines for SAS IO Unit
++ *  Page 1.
++ *  Added MaxNumPhysicalMappedIDs field to SAS IO Unit
++ *  Page 2.
++ *  Added AccessStatus field to SAS Device Page 0 and 
added
++ *  new Flags bits for supported SATA features.
++ *  12-07-04  01.05.04  Added config page structures for BIOS Page 2, RAID
++ *  Volume Page 1, and RAID Physical Disk Page 1.
++ *  Replaced IO Unit Page 1 

DISTFILES: mpt-status-1.2.0.tar.bz2

2006-11-13 Thread qboosh

Files fetched: 1

STORED: http://www.drugphish.ch/~ratz/mpt-status/mpt-status-1.2.0.tar.bz2
fae044db1340fd37aa81b4ecef7bbd46  mpt-status-1.2.0.tar.bz2
Size: 36060 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


SPECS: mpt-status.spec - updated to 1.2.0, updated headers

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 13:27:29 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 1.2.0, updated headers

 Files affected:
SPECS:
   mpt-status.spec (1.4 - 1.5) 

 Diffs:


Index: SPECS/mpt-status.spec
diff -u SPECS/mpt-status.spec:1.4 SPECS/mpt-status.spec:1.5
--- SPECS/mpt-status.spec:1.4   Tue Mar  7 19:43:55 2006
+++ SPECS/mpt-status.spec   Mon Nov 13 14:27:24 2006
@@ -2,13 +2,13 @@
 Summary:   Program to print the status of an LSI 1030 RAID controller
 Summary(pl):   Program podający stan kontrolera LSI 1030 RAID
 Name:  mpt-status
-Version:   1.1.6
+Version:   1.2.0
 Release:   1
 License:   GPL v2+
 Group: Applications/System
 Source0:   
http://www.drugphish.ch/~ratz/mpt-status/%{name}-%{version}.tar.bz2
-# Source0-md5: 0758574317e9a32e9622c36820f6796f
-# needed headers taken from kernel 2.4.31 source
+# Source0-md5: fae044db1340fd37aa81b4ecef7bbd46
+# needed headers taken from kernel 2.6.16.29 source
 Patch0:%{name}-headers.patch
 URL:   http://www.red-bean.com/~mab/mpt-status.html
 BuildRequires: pciutils-devel
@@ -33,9 +33,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8}
 
 install mpt-status $RPM_BUILD_ROOT%{_bindir}
+install man/mpt-status.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +44,8 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/{AUTHORS,Changelog,README,THANKS,ReleaseNotes}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/mpt-status
+%{_mandir}/man8/mpt-status.8*
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -51,6 +53,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 13:27:24  qboosh
+- updated to 1.2.0, updated headers
+
 Revision 1.4  2006/03/07 18:43:55  qboosh
 - updated to 1.1.6
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/mpt-status.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


SOURCES: munin-plugins.patch - full path to ntpq for ntp_

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 14:06:19 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- full path to ntpq for ntp_

 Files affected:
SOURCES:
   munin-plugins.patch (1.11 - 1.12) 

 Diffs:


Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.11 SOURCES/munin-plugins.patch:1.12
--- SOURCES/munin-plugins.patch:1.11Mon Nov 13 12:33:29 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 15:06:14 2006
@@ -628,3 +628,51 @@
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
+--- munin-1.3.3/node/node.d/ntp_.in~   2006-11-10 13:39:13.0 +0100
 munin-1.3.3/node/node.d/ntp_.in2006-11-13 15:05:27.0 +0100
+@@ -25,9 +25,9 @@
+ use Socket;
+ 
+ if ($ARGV[0] and $ARGV[0] eq autoconf) {
+-  `ntpq -c help /dev/null 2/dev/null`;
++  `/usr/sbin/ntpq -c help /dev/null 2/dev/null`;
+   if ($? eq 0) {
+-  if (`ntpq -c hostnames no -c peers | wc -l`  0) {
++  if (`/usr/sbin/ntpq -c hostnames no -c peers | wc -l`  0) {
+   print yes\n;
+   exit 0;
+   } else {
+@@ -35,13 +35,13 @@
+   exit 1;
+   }
+   } else {
+-  print no (ntpq not found)\n;
++  print no (/usr/sbin/ntpq not found)\n;
+   exit 1;
+   }
+ }
+ 
+ if ($ARGV[0] and $ARGV[0] eq suggest) {
+-  my @lines = `ntpq -c hostnames no -c peers`;
++  my @lines = `/usr/sbin/ntpq -c hostnames no -c peers`;
+   foreach (@lines) {
+   next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+   next if /^.224\.0\.1\.1/;
+@@ -61,7 +61,7 @@
+ exit 2 unless defined $name;
+ 
+ if ($ARGV[0] and $ARGV[0] eq config) {
+-  my @lines = `ntpq -c hostnames no -c peers`;
++  my @lines = `/usr/sbin/ntpq -c hostnames no -c peers`;
+   my $host;
+   foreach (@lines) {
+   next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+@@ -89,7 +89,7 @@
+ exit 0;
+ }
+ 
+-my @lines = `ntpq -c hostnames no -c peers`;
++my @lines = `/usr/sbin/ntpq -c hostnames no -c peers`;
+ foreach (@lines) {
+   next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+   next if /^.224\.0\.1\.1/;


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin-plugins.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


SOURCES: munin-plugins.patch - more ntpq

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 14:07:56 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- more ntpq

 Files affected:
SOURCES:
   munin-plugins.patch (1.12 - 1.13) 

 Diffs:


Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.12 SOURCES/munin-plugins.patch:1.13
--- SOURCES/munin-plugins.patch:1.12Mon Nov 13 15:06:14 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 15:07:51 2006
@@ -676,3 +676,44 @@
  foreach (@lines) {
next unless /^.(\d+\.\d+\.\d+\.\d+)/;
next if /^.224\.0\.1\.1/;
+--- munin-1.3.3/node/node.d/ntp_states.in~ 2006-11-10 13:39:13.0 
+0100
 munin-1.3.3/node/node.d/ntp_states.in  2006-11-13 15:07:26.0 
+0100
+@@ -35,9 +35,9 @@
+);
+ 
+ if ($ARGV[0] and $ARGV[0] eq autoconf) {
+-  `ntpq -c help /dev/null 2/dev/null`;
++  `/usr/sbin/ntpq -c help /dev/null 2/dev/null`;
+   if ($? eq 0) {
+-  if (`ntpq -c hostnames no -c peers | wc -l`  0) {
++  if (`/usr/sbin/ntpq -c hostnames no -c peers | wc -l`  0) {
+   print yes\n;
+   exit 0;
+   } else {
+@@ -45,7 +45,7 @@
+   exit 0;
+   }
+   } else {
+-  print no (ntpq not found)\n;
++  print no (/usr/sbin/ntpq not found)\n;
+   exit 1;
+   }
+ }
+@@ -54,7 +54,7 @@
+ print graph_title NTP states\n;
+   print graph_args --base 1000 --vertical-label msec --lower-limit 0\n;
+   print graph_category time\n;
+-  foreach (`ntpq -c hostnames no -c peers`) {
++  foreach (`/usr/sbin/ntpq -c hostnames no -c peers`) {
+   next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+   next if /^.224\.0\.1\.1/;
+   my $addr = $1;
+@@ -69,7 +69,7 @@
+ exit 0;
+ }
+ 
+-foreach (`ntpq -c hostnames no -c peers`) {
++foreach (`/usr/sbin/ntpq -c hostnames no -c peers`) {
+   next unless /^(.)(\d+\.\d+\.\d+\.\d+)/;
+   next if /^.224\.0\.1\.1/;
+   my $state = $1;


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?r1=1.12r2=1.13f=u

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


SOURCES: scute-opt.patch (NEW) - don't override our optflags

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 14:25:13 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- don't override our optflags

 Files affected:
SOURCES:
   scute-opt.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/scute-opt.patch
diff -u /dev/null SOURCES/scute-opt.patch:1.1
--- /dev/null   Mon Nov 13 15:25:13 2006
+++ SOURCES/scute-opt.patch Mon Nov 13 15:25:08 2006
@@ -0,0 +1,11 @@
+--- scute-1.0.0/configure.ac.orig  2006-11-11 23:35:26.0 +0100
 scute-1.0.0/configure.ac   2006-11-13 15:13:43.269505000 +0100
+@@ -72,7 +72,7 @@
+ 
+ # FIXME: We should support setting the CFLAGS by the user.  But
+ # -std=gnu99 is required.
+-CFLAGS=-std=gnu99 -Wall -Wno-pointer-sign -g -O3
++CFLAGS=$CFLAGS -std=gnu99 -Wall
+ 
+ AC_ARG_ENABLE(optimization,
+AC_HELP_STRING([--disable-optimization],

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


SPECS: scute.spec (NEW) - new

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 14:25:47 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- new

 Files affected:
SPECS:
   scute.spec (NONE - 1.1)  (NEW)

 Diffs:


Index: SPECS/scute.spec
diff -u /dev/null SPECS/scute.spec:1.1
--- /dev/null   Mon Nov 13 15:25:47 2006
+++ SPECS/scute.specMon Nov 13 15:25:42 2006
@@ -0,0 +1,77 @@
+# $Revision$, $Date$
+Summary:   PKCS#11 implementation of GnuPG Agent using the GnuPG Smart 
Card Daemon
+Summary(pl):   Implementacja PKCS#11 Agenta GnuPG przy użyciu GnuPG Smart Card 
Daemona
+Name:  scute
+Version:   1.0.0
+Release:   1
+License:   GPL v2+
+Group: Applications
+Source0:   ftp://ftp.gnupg.org/gcrypt/scute/%{name}-%{version}.tar.bz2
+# Source0-md5: 1e5b495c801482b84933fff22b641959
+Patch0:%{name}-opt.patch
+URL:   http://www.gnupg.org/
+BuildRequires: autoconf = 2.59
+BuildRequires: automake = 1:1.9.3
+# configure says 0.6.10, but assuan_set_assuan_err_source() needs 0.9.0
+BuildRequires: libassuan-devel = 1:0.9.0
+BuildRequires: libgpg-error-devel = 0.7
+BuildRequires: libtool
+Requires:  gnupg-smime = 1.9.6
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This is a PKCS#11 implementation for the GnuPG Agent using the GnuPG
+Smart Card Daemon. Currently, only the OpenPGP card is supported.
+
+Scute enables you to use your OpenPGP smart card for client
+authentication with SSL in Mozilla.
+
+%description -l pl
+To jest implementacja PKCS#11 Agenta GnuPG przy użyciu GnuPG Smart
+Card Daemona. Aktualnie obsługiwane są tylko karty OpenPGP.
+
+Scute pozwala używać kart procesorowych OpenPGP do uwierzytelniania
+klientów przy użyciu SSL w Mozilli.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+   --with-gpgsm=/usr/bin/gpgsm
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+   DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/libscute.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_libdir}/libscute.so.*.*.*
+%attr(755,root,root) %{_libdir}/libscute.so
+
+%define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team [EMAIL PROTECTED]
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1  2006/11/13 14:25:42  qboosh
+- new

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


DISTFILES: scute-1.0.0.tar.bz2

2006-11-13 Thread qboosh

Files fetched: 1

STORED: ftp://ftp.gnupg.org/gcrypt/scute/scute-1.0.0.tar.bz2
1e5b495c801482b84933fff22b641959  scute-1.0.0.tar.bz2
Size: 333223 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


SPECS: Atari800.spec, EMCpower.spec, LTI-Lib.spec, VMware-player.s...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 14:51:51 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   Atari800.spec (1.52 - 1.53) , EMCpower.spec (1.13 - 1.14) , LTI-Lib.spec 
(1.7 - 1.8) , VMware-player.spec (1.8 - 1.9) , VMware-server.spec (1.20 - 
1.21) , VMware-workstation.spec (1.96 - 1.97) , X11-driver-firegl.spec (1.134 
- 1.135) , X11-driver-nvidia.spec (1.87 - 1.88) , acroread.spec (1.67 - 
1.68) , allegro.spec (1.63 - 1.64) , atmelwlandriver.spec (1.44 - 1.45) 

 Diffs:


Index: SPECS/Atari800.spec
diff -u SPECS/Atari800.spec:1.52 SPECS/Atari800.spec:1.53
--- SPECS/Atari800.spec:1.52Sun Apr 23 16:16:43 2006
+++ SPECS/Atari800.spec Mon Nov 13 15:51:45 2006
@@ -41,7 +41,7 @@
 Summary(pl):   Emulator Atari 800 - pliki wspólne dla wersji svgalib oraz X11
 Group: Applications/Emulators
 Obsoletes: Atari800
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Requires(post):unzip
 %endif
 
@@ -50,7 +50,7 @@
 
 This package contains common files for both svgalib and X11 versions
 of Atari800.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Note: because of license problems we had to include whole X-Former
 archive (xf25.zip). If you don't want it - rebuild Atari800 (--with
 license_agreement)
@@ -61,7 +61,7 @@
 
 Ten pakiet zawiera pliki wspólne dla wersji działających pod svgalib
 oraz X11.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Uwaga: z powodu problemów z licencją musieliśmy załączyć całą paczkę
 z emulatorem X-Former (xf25.zip). Jeśli jej nie chcesz w pakiecie -
 przebuduj pakiet z opcja --with license_agreement.
@@ -190,7 +190,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %post common
 cd %{_datadir}/atari800
 if [ `echo *.rom` = *.rom ]; then
@@ -227,6 +227,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.53  2006/11/13 14:51:45  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.52  2006/04/23 14:16:43  qboosh
 - updated to 2.0.2, modular xorg
 


Index: SPECS/EMCpower.spec
diff -u SPECS/EMCpower.spec:1.13 SPECS/EMCpower.spec:1.14
--- SPECS/EMCpower.spec:1.13Wed Sep  6 15:48:33 2006
+++ SPECS/EMCpower.spec Mon Nov 13 15:51:45 2006
@@ -8,7 +8,7 @@
 %bcond_without userspace   # don't build userspace programs
 %bcond_withverbose # verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -317,6 +317,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.14  2006/11/13 14:51:45  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.13  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 


Index: SPECS/LTI-Lib.spec
diff -u SPECS/LTI-Lib.spec:1.7 SPECS/LTI-Lib.spec:1.8
--- SPECS/LTI-Lib.spec:1.7  Wed Jul 26 17:36:43 2006
+++ SPECS/LTI-Lib.spec  Mon Nov 13 15:51:45 2006
@@ -113,7 +113,7 @@
 %endif
 
 %configure \
-%if %{without gtk}
+%if !%{with gtk}
--without-gtk \
 %endif
--disable-debug
@@ -164,6 +164,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 14:51:45  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.7  2006/07/26 15:36:43  glen
 - remove extra unneeded slash
 


Index: SPECS/VMware-player.spec
diff -u SPECS/VMware-player.spec:1.8 SPECS/VMware-player.spec:1.9
--- SPECS/VMware-player.spec:1.8Thu Oct 12 22:47:30 2006
+++ SPECS/VMware-player.specMon Nov 13 15:51:45 2006
@@ -294,7 +294,7 @@
 rm -rf built
 mkdir built
 
-%if %{without kernel24}
+%if !%{with kernel24}
 for mod in vmmon vmnet ; do
for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
@@ -393,7 +393,7 @@
 
 cd vmware-any-any-update%{_urel}
 
-%if %{without kernel24}
+%if !%{with kernel24}
 install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko
 install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
@@ -582,7 +582,7 @@
 %endif
 
 %if %{with kernel}
-%if %{without kernel24}
+%if !%{with kernel24}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -630,6 +630,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.9  2006/11/13 

SPECS: audit.spec, avahi.spec, bacula.spec, bcm5700.spec, beagle.s...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 14:53:26 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   audit.spec (1.31 - 1.32) , avahi.spec (1.53 - 1.54) , bacula.spec (1.48 - 
1.49) , bcm5700.spec (1.51 - 1.52) , beagle.spec (1.94 - 1.95) , 
blackbird-firmware.spec (1.2 - 1.3) , captive-drivers.spec (1.6 - 1.7) , 
cdrdao.spec (1.64 - 1.65) , changepassword.spec (1.21 - 1.22) , 
cisco-vpnclient.spec (1.15 - 1.16) , crossmingw32-gcc.spec (1.69 - 1.70) , 
cyrus-sasl.spec (1.157 - 1.158) , dazuko.spec (1.18 - 1.19) , db4.2.spec 
(1.76 - 1.77) 

 Diffs:


Index: SPECS/audit.spec
diff -u SPECS/audit.spec:1.31 SPECS/audit.spec:1.32
--- SPECS/audit.spec:1.31   Sat Oct 28 00:11:44 2006
+++ SPECS/audit.specMon Nov 13 15:53:20 2006
@@ -117,7 +117,7 @@
 install -D %{SOURCE1} lib/linux/audit.h
 install -D %{SOURCE1} src/mt/linux/audit.h
 
-%if %{without python}
+%if !%{with python}
 sed '/PYTHON/d; s#swig/Makefile ##' -i configure.ac
 sed 's/swig//' -i Makefile.am
 %endif
@@ -245,6 +245,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.32  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.31  2006/10/27 22:11:44  qboosh
 - updated to 1.2.9
 


Index: SPECS/avahi.spec
diff -u SPECS/avahi.spec:1.53 SPECS/avahi.spec:1.54
--- SPECS/avahi.spec:1.53   Sat Oct  7 17:13:47 2006
+++ SPECS/avahi.specMon Nov 13 15:53:20 2006
@@ -10,7 +10,7 @@
 %bcond_without qt3 # build without qt3 bindings
 %bcond_without qt4 # build without qt4 bindings
 #
-%if %{without qt}
+%if !%{with qt}
 %undefine  with_qt3
 %undefine  with_qt4
 %endif
@@ -667,6 +667,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.54  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.53  2006/10/07 15:13:47  qboosh
 - wants python = 2.4
 


Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.48 SPECS/bacula.spec:1.49
--- SPECS/bacula.spec:1.48  Fri Oct 20 19:48:00 2006
+++ SPECS/bacula.spec   Mon Nov 13 15:53:20 2006
@@ -476,7 +476,7 @@
 rm -f 
$RPM_BUILD_ROOT%{_libexecdir}/%{name}/{gconsole,startmysql,stopmysql,bacula,bconsole,fd}
 rm -f $RPM_BUILD_ROOT%{_sbindir}/static-bacula-fd
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome*
-%if %{without console_wx}
+%if !%{with console_wx}
 rm -f $RPM_BUILD_ROOT%{_desktopdir}/bacula-wx.desktop
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wx-console*
 %endif
@@ -801,6 +801,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.49  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.48  2006/10/20 17:48:00  sls
 - removed dvd_restore patch (probably outdated)
 - added compile and link patches


Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.51 SPECS/bcm5700.spec:1.52
--- SPECS/bcm5700.spec:1.51 Wed Apr 12 14:15:40 2006
+++ SPECS/bcm5700.spec  Mon Nov 13 15:53:20 2006
@@ -7,7 +7,7 @@
 %bcond_without userspace   # don't build userspace programs
 %bcond_withverbose # verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -175,6 +175,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.52  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.51  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 


Index: SPECS/beagle.spec
diff -u SPECS/beagle.spec:1.94 SPECS/beagle.spec:1.95
--- SPECS/beagle.spec:1.94  Sun Nov  5 14:21:12 2006
+++ SPECS/beagle.spec   Mon Nov 13 15:53:20 2006
@@ -15,7 +15,7 @@
 %bcond_without epiphany# don't build epiphany extension
 %bcond_withsqlite3 # use sqlite3 instead of sqlite2
 #
-%if %{without gui}
+%if !%{with gui}
 %undefine  with_evolution
 %endif
 #
@@ -395,6 +395,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.95  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.94  2006/11/05 13:21:12  deejay1
 - up to 0.2.12
 


Index: SPECS/blackbird-firmware.spec
diff -u SPECS/blackbird-firmware.spec:1.2 SPECS/blackbird-firmware.spec:1.3
--- SPECS/blackbird-firmware.spec:1.2   Sun Oct  8 18:06:02 2006
+++ SPECS/blackbird-firmware.spec   Mon Nov 

SPECS: db4.3.spec, db4.4.spec, db4.5.spec, dosemu.spec, e2fsprogs....

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 14:54:54 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   db4.3.spec (1.14 - 1.15) , db4.4.spec (1.5 - 1.6) , db4.5.spec (1.4 - 
1.5) , dosemu.spec (1.120 - 1.121) , e2fsprogs.spec (1.153 - 1.154) , 
eclipse-swt.spec (1.7 - 1.8) , ekg2.spec (1.72 - 1.73) , em8300.spec (1.43 - 
1.44) , emacs.spec (1.78 - 1.79) , emacsen-gnus-pkg.spec (1.6 - 1.7) , 
emotion.spec (1.12 - 1.13) , evidence.spec (1.4 - 1.5) , fasm.spec (1.6 - 
1.7) , fbida.spec (1.9 - 1.10) , fonts-TTF-Bitstream-Cyberfonts.spec (1.6 - 
1.7) , fonts-TTF-Microsoft-ArialUnicode.spec (1.7 - 1.8) 

 Diffs:


Index: SPECS/db4.3.spec
diff -u SPECS/db4.3.spec:1.14 SPECS/db4.3.spec:1.15
--- SPECS/db4.3.spec:1.14   Tue Dec 13 19:01:46 2005
+++ SPECS/db4.3.specMon Nov 13 15:54:48 2006
@@ -237,7 +237,7 @@
 %prep
 %setup -q -n db-%{version}
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED(POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -477,6 +477,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.14  2005/12/13 18:01:46  glen
 - adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
 


Index: SPECS/db4.4.spec
diff -u SPECS/db4.4.spec:1.5 SPECS/db4.4.spec:1.6
--- SPECS/db4.4.spec:1.5Wed Apr 19 19:41:20 2006
+++ SPECS/db4.4.specMon Nov 13 15:54:48 2006
@@ -243,7 +243,7 @@
 %patch0 -p0
 %patch1 -p0
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED(POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -491,6 +491,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.6  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.5  2006/04/19 17:41:20  witekfl
 - IMHO better handling of without_static_libs
 


Index: SPECS/db4.5.spec
diff -u SPECS/db4.5.spec:1.4 SPECS/db4.5.spec:1.5
--- SPECS/db4.5.spec:1.4Mon Oct 30 20:06:15 2006
+++ SPECS/db4.5.specMon Nov 13 15:54:48 2006
@@ -243,7 +243,7 @@
 %prep
 %setup -q -n db-%{version}
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED(POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -494,6 +494,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.4  2006/10/30 19:06:15  pluto
 - release 2.
 


Index: SPECS/dosemu.spec
diff -u SPECS/dosemu.spec:1.120 SPECS/dosemu.spec:1.121
--- SPECS/dosemu.spec:1.120 Fri Oct 20 07:58:31 2006
+++ SPECS/dosemu.spec   Mon Nov 13 15:54:48 2006
@@ -35,7 +35,7 @@
 URL:   http://www.dosemu.org/
 BuildRequires: SDL-devel
 %if %{with x}
-%if %{without AC}
+%if !%{with AC}
 BuildRequires: xorg-lib-libX11-devel
 %{?with_static:BuildRequires:  xorg-lib-libX11-static}
 %endif
@@ -276,6 +276,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.121  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.120  2006/10/20 05:58:31  pascalek
 - updated to 1.3.3.1 svn, AC bcond
 


Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.153 SPECS/e2fsprogs.spec:1.154
--- SPECS/e2fsprogs.spec:1.153  Fri Oct 20 20:19:51 2006
+++ SPECS/e2fsprogs.specMon Nov 13 15:54:48 2006
@@ -667,7 +667,7 @@
 %files devel
 %defattr(644,root,root,755)
 %doc doc/libblkid.txt
-%if %{without allstatic}
+%if !%{with allstatic}
 %attr(755,root,root) %{_libdir}/libblkid.so
 %attr(755,root,root) %{_libdir}/libe2p.so
 %attr(755,root,root) %{_libdir}/libext2fs.so
@@ -748,6 +748,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.154  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.153  2006/10/20 18:19:51  glen
 - package /etc/blkid.tab
 


Index: SPECS/eclipse-swt.spec
diff -u SPECS/eclipse-swt.spec:1.7 SPECS/eclipse-swt.spec:1.8
--- SPECS/eclipse-swt.spec:1.7  Thu Jun 22 12:02:22 2006
+++ SPECS/eclipse-swt.spec  Mon Nov 13 15:54:48 2006
@@ -89,7 +89,7 @@
 
 patch -p0  %{PATCH0}
 patch -p0  %{PATCH1}
-%if %{without gnome}
+%if !%{with gnome}
 patch -p0  %{PATCH2}
 %endif
 
@@ -187,6 +187,9 @@
 All persons listed below can be reached at 

SOURCES: munin-plugins.patch - fix special case for iostat

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 14:58:00 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fix special case for iostat

 Files affected:
SOURCES:
   munin-plugins.patch (1.13 - 1.14) 

 Diffs:


Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.13 SOURCES/munin-plugins.patch:1.14
--- SOURCES/munin-plugins.patch:1.13Mon Nov 13 15:07:51 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 15:57:54 2006
@@ -717,3 +717,14 @@
next unless /^(.)(\d+\.\d+\.\d+\.\d+)/;
next if /^.224\.0\.1\.1/;
my $state = $1;
+--- munin-1.3.3/node/node.d.linux/iostat.in~   2006-11-10 13:39:13.0 
+0100
 munin-1.3.3/node/node.d.linux/iostat.in2006-11-13 15:57:04.0 
+0100
+@@ -145,7 +145,7 @@
+   if ($tmpnam =~ /\d+$/ ) {
+   # Special case for devices like cXdXpX,
+   # like the cciss driver
+-  next unless $tmpnam =~ /\/c\d+d\d+$/
++  next unless $tmpnam =~ /\/.*d\d+$/
+   }
+   next unless grep { $_ } @fields;
+ 


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?r1=1.13r2=1.14f=u

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


SPECS: fonts-TTF-microsoft-tahoma.spec, fonts-TTF-microsoft.spec, ...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 14:57:00 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   fonts-TTF-microsoft-tahoma.spec (1.10 - 1.11) , fonts-TTF-microsoft.spec 
(1.32 - 1.33) , fwbuilder.spec (1.38 - 1.39) , gcc.spec (1.428 - 1.429) , 
gdkxft.spec (1.59 - 1.60) , glibc.spec (1.663 - 1.664) , gmutoo.spec (1.3 - 
1.4) , go7007.spec (1.9 - 1.10) , grub.spec (1.105 - 1.106) , kadu.spec 
(1.168 - 1.169) , kde-i18n.spec (1.159 - 1.160) , 
kde-theme-linspireclear.spec (1.7 - 1.8) , kdegraphics.spec (1.184 - 1.185) , 
kdemultimedia.spec (1.223 - 1.224) , kernel-isdn-fcpci.spec (1.5 - 1.6) 

 Diffs:


Index: SPECS/fonts-TTF-microsoft-tahoma.spec
diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.10 
SPECS/fonts-TTF-microsoft-tahoma.spec:1.11
--- SPECS/fonts-TTF-microsoft-tahoma.spec:1.10  Sat Apr 22 20:48:19 2006
+++ SPECS/fonts-TTF-microsoft-tahoma.spec   Mon Nov 13 15:56:53 2006
@@ -48,7 +48,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{without license_agreement}
+%if !%{with license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -103,6 +103,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.11  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.10  2006/04/22 18:48:19  glen
 - rel 3
 


Index: SPECS/fonts-TTF-microsoft.spec
diff -u SPECS/fonts-TTF-microsoft.spec:1.32 SPECS/fonts-TTF-microsoft.spec:1.33
--- SPECS/fonts-TTF-microsoft.spec:1.32 Wed Jun 21 21:31:45 2006
+++ SPECS/fonts-TTF-microsoft.spec  Mon Nov 13 15:56:53 2006
@@ -81,7 +81,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -139,6 +139,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.33  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.32  2006/06/21 19:31:45  glen
 - pure requires on fontpostinst
 


Index: SPECS/fwbuilder.spec
diff -u SPECS/fwbuilder.spec:1.38 SPECS/fwbuilder.spec:1.39
--- SPECS/fwbuilder.spec:1.38   Fri Jul 28 23:51:52 2006
+++ SPECS/fwbuilder.specMon Nov 13 15:56:53 2006
@@ -209,7 +209,7 @@
 # Without it this app uses ccache if it's found in system even if we don't
 # want it
 
-%if %{without ccache}
+%if !%{with ccache}
 grep -vi ccache configure.in  configure.in.x
 mv configure.in.x configure.in
 %endif
@@ -340,6 +340,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.39  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.38  2006/07/28 21:51:52  charles
 - updated to 2.0.12 (bugfix release)
 - STBR


Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.428 SPECS/gcc.spec:1.429
--- SPECS/gcc.spec:1.428Fri Nov 10 20:49:02 2006
+++ SPECS/gcc.spec  Mon Nov 13 15:56:53 2006
@@ -15,16 +15,16 @@
 %bcond_without bootstrap   # omit 3-stage bootstrap
 %bcond_withtests   # torture gcc
 
-%if %{without cxx}
+%if !%{with cxx}
 %undefine  with_java
 %undefine  with_objcxx
 %endif
 
-%if %{without objc}
+%if !%{with objc}
 %undefine  with_objcxx
 %endif
 
-%if %{without bootstrap}
+%if !%{with bootstrap}
 %undefine  with_profiling
 %endif
 
@@ -1399,6 +1399,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.429  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.428  2006/11/10 19:49:02  pluto
 - updated to 4.2.0-20061110 (rev. 118658).
 - BR: mpfr-devel = 2.2.


Index: SPECS/gdkxft.spec
diff -u SPECS/gdkxft.spec:1.59 SPECS/gdkxft.spec:1.60
--- SPECS/gdkxft.spec:1.59  Sun Sep  3 13:16:23 2006
+++ SPECS/gdkxft.spec   Mon Nov 13 15:56:53 2006
@@ -92,7 +92,7 @@
 %setup -q
 
 %build
-%if %{without gnome}
+%if !%{with gnome}
 cat  acinclude.m4 EOF
 AC_DEFUN([AM_PATH_LIBGLADE],[
 AM_CONDITIONAL([HAVE_ORBIT],false)
@@ -183,6 +183,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.60  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.59  2006/09/03 11:16:23  glen
 - strict internal deps
 


Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.663 SPECS/glibc.spec:1.664
--- 

SPECS: kernel-misc-qvm86.spec, kernel-misc-toshbt.spec, kernel-vid...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:00:17 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   kernel-misc-qvm86.spec (1.3 - 1.4) , kernel-misc-toshbt.spec (1.3 - 1.4) , 
kernel-video-drm.spec (1.21 - 1.22) , kernel-video-viafb.spec (1.3 - 1.4) , 
kernel24.spec (1.779 - 1.780) , libao.spec (1.61 - 1.62) , libgda.spec (1.107 
- 1.108) , libglade.spec (1.79 - 1.80) , librpcsecgss.spec (1.14 - 1.15) , 
lighttpd.spec (1.190 - 1.191) , linux-fusion.spec (1.6 - 1.7) , 
linuxwacom.spec (1.15 - 1.16) , lirc.spec (1.128 - 1.129) , lirc24.spec 
(1.123 - 1.124) , macromedia-flash.spec (1.59 - 1.60) , mp1e.spec (1.3 - 
1.4) 

 Diffs:


Index: SPECS/kernel-misc-qvm86.spec
diff -u SPECS/kernel-misc-qvm86.spec:1.3 SPECS/kernel-misc-qvm86.spec:1.4
--- SPECS/kernel-misc-qvm86.spec:1.3Sat Oct  7 13:30:46 2006
+++ SPECS/kernel-misc-qvm86.specMon Nov 13 16:00:11 2006
@@ -7,7 +7,7 @@
 %bcond_without userspace   # don't build userspace programs
 %bcond_withverbose # verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 #
@@ -158,6 +158,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/10/07 11:30:46  qboosh
 - pl
 


Index: SPECS/kernel-misc-toshbt.spec
diff -u SPECS/kernel-misc-toshbt.spec:1.3 SPECS/kernel-misc-toshbt.spec:1.4
--- SPECS/kernel-misc-toshbt.spec:1.3   Fri Sep  8 18:14:41 2006
+++ SPECS/kernel-misc-toshbt.spec   Mon Nov 13 16:00:11 2006
@@ -10,7 +10,7 @@
 %bcond_without smp # don't build SMP module
 %bcond_withverbose # verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -165,6 +165,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/09/08 16:14:41  qboosh
 - main desc
 


Index: SPECS/kernel-video-drm.spec
diff -u SPECS/kernel-video-drm.spec:1.21 SPECS/kernel-video-drm.spec:1.22
--- SPECS/kernel-video-drm.spec:1.21Wed Apr  5 10:28:28 2006
+++ SPECS/kernel-video-drm.spec Mon Nov 13 16:00:11 2006
@@ -10,7 +10,7 @@
 %bcond_without smp # don't build SMP module
 %bcond_withverbose # verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -156,6 +156,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.22  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.21  2006/04/05 08:28:28  wiget
 - updated to 20060405 snapshot
 


Index: SPECS/kernel-video-viafb.spec
diff -u SPECS/kernel-video-viafb.spec:1.3 SPECS/kernel-video-viafb.spec:1.4
--- SPECS/kernel-video-viafb.spec:1.3   Sun Oct  8 21:19:17 2006
+++ SPECS/kernel-video-viafb.spec   Mon Nov 13 16:00:11 2006
@@ -6,7 +6,7 @@
 %bcond_without smp # don't build SMP module
 %bcond_withverbose # verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -168,6 +168,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/10/08 19:19:17  qboosh
 - direct Source0 URL
 


Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.779 SPECS/kernel24.spec:1.780
--- SPECS/kernel24.spec:1.779   Fri Nov  3 13:34:38 2006
+++ SPECS/kernel24.spec Mon Nov 13 16:00:11 2006
@@ -1019,7 +1019,7 @@
echo BUILDING KERNEL $*...
 : arch/%{base_arch}/defconfig
cat $RPM_SOURCE_DIR/%{name}-$Config.config  
arch/%{base_arch}/defconfig
-%if %{without um}
+%if !%{with um}
 %ifarch i386
echo CONFIG_M386=y  arch/%{base_arch}/defconfig
 %endif
@@ -1714,6 +1714,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.780  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.779  2006/11/03 12:34:38  marcus
 - rel.2. stbr for Ac.
 


Index: SPECS/libao.spec
diff -u SPECS/libao.spec:1.61 SPECS/libao.spec:1.62
--- SPECS/libao.spec:1.61   Sun Aug 27 08:12:52 2006
+++ 

SPECS: libnfsidmap.spec - updated to 0.18

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 15:05:06 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 0.18

 Files affected:
SPECS:
   libnfsidmap.spec (1.4 - 1.5) 

 Diffs:


Index: SPECS/libnfsidmap.spec
diff -u SPECS/libnfsidmap.spec:1.4 SPECS/libnfsidmap.spec:1.5
--- SPECS/libnfsidmap.spec:1.4  Wed Aug 16 21:09:44 2006
+++ SPECS/libnfsidmap.spec  Mon Nov 13 16:05:01 2006
@@ -2,12 +2,12 @@
 Summary:   Library to help mapping id's, mainly for NFSv4
 Summary(pl):   Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla 
NFSv4
 Name:  libnfsidmap
-Version:   0.17
+Version:   0.18
 Release:   1
 License:   BSD
 Group: Libraries
 Source0:   
http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{name}-%{version}.tar.gz
-# Source0-md5: 71deae2107c7494f194e7b4b31be
+# Source0-md5: f364d649196ae26ea6dc9184ea754f4c
 URL:   http://www.citi.umich.edu/projects/nfsv4/linux/
 BuildRequires: openldap-devel = 2.3.0
 Obsoletes: nfsidmap
@@ -88,6 +88,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 15:05:01  qboosh
+- updated to 0.18
+
 Revision 1.4  2006/08/16 19:09:44  qboosh
 - updated to 0.17
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/libnfsidmap.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


SPECS: w32codec.spec, wanpipe.spec, wine.spec, xemacs.spec, xfspro...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:06:08 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   w32codec.spec (1.87 - 1.88) , wanpipe.spec (1.34 - 1.35) , wine.spec 
(1.256 - 1.257) , xemacs.spec (1.151 - 1.152) , xfsprogs.spec (1.83 - 1.84) 
, xorg-driver-video-fglrx.spec (1.18 - 1.19) , zaptel-alt.spec (1.3 - 1.4) 

 Diffs:


Index: SPECS/w32codec.spec
diff -u SPECS/w32codec.spec:1.87 SPECS/w32codec.spec:1.88
--- SPECS/w32codec.spec:1.87Wed Nov  8 20:10:42 2006
+++ SPECS/w32codec.spec Mon Nov 13 16:06:00 2006
@@ -67,7 +67,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -86,7 +86,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa
 %endif
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %post
 %{_bindir}/%{base_name}.install
 %endif
@@ -109,6 +109,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.88  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.87  2006/11/08 19:10:42  witekfl
 - updated to 20061022
 


Index: SPECS/wanpipe.spec
diff -u SPECS/wanpipe.spec:1.34 SPECS/wanpipe.spec:1.35
--- SPECS/wanpipe.spec:1.34 Mon Oct  9 22:17:37 2006
+++ SPECS/wanpipe.spec  Mon Nov 13 16:06:00 2006
@@ -5,7 +5,7 @@
 %bcond_without kernel  # don't build kernel modules
 %bcond_without smp # don't build SMP module
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine  with_dist_kernel
 %endif
 
@@ -222,6 +222,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.35  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.34  2006/10/09 20:17:37  glen
 - make -j1
 


Index: SPECS/wine.spec
diff -u SPECS/wine.spec:1.256 SPECS/wine.spec:1.257
--- SPECS/wine.spec:1.256   Sat Nov 11 03:17:35 2006
+++ SPECS/wine.spec Mon Nov 13 16:06:00 2006
@@ -20,7 +20,7 @@
 # thus requires rebuild after change of any of the above.
 #
 # JACK requires ALSA
-%if %{without alsa}
+%if !%{with alsa}
 %undefine  with_jack
 %endif
 Summary:   Program that lets you launch Win applications
@@ -471,6 +471,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.257  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.256  2006/11/11 02:17:35  wolf
 - 0.9.25
 


Index: SPECS/xemacs.spec
diff -u SPECS/xemacs.spec:1.151 SPECS/xemacs.spec:1.152
--- SPECS/xemacs.spec:1.151 Tue Nov  7 23:31:36 2006
+++ SPECS/xemacs.spec   Mon Nov 13 16:06:00 2006
@@ -292,7 +292,7 @@
--without-ldap \
--without-dragndrop \
--without-msw \
-%if %{without pdump}
+%if !%{with pdump}
--pdump=no
 %endif
 
@@ -487,6 +487,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.152  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.151  2006/11/07 22:31:36  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories 
unexpectedly
 


Index: SPECS/xfsprogs.spec
diff -u SPECS/xfsprogs.spec:1.83 SPECS/xfsprogs.spec:1.84
--- SPECS/xfsprogs.spec:1.83Mon Oct 30 21:25:29 2006
+++ SPECS/xfsprogs.spec Mon Nov 13 16:06:00 2006
@@ -169,7 +169,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%if %{without static}
+%if !%{with static}
 %attr(755,root,root) %{_libexecdir}/lib*.so
 %{_libexecdir}/lib*.la
 %endif
@@ -187,6 +187,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.84  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.83  2006/10/30 20:25:29  qboosh
 - updated to 2.8.16, updated pl.po-update patch, added gettext patch
 


Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.18 
SPECS/xorg-driver-video-fglrx.spec:1.19
--- SPECS/xorg-driver-video-fglrx.spec:1.18 Mon Nov 13 13:45:53 2006
+++ SPECS/xorg-driver-video-fglrx.spec  Mon Nov 13 16:06:00 2006
@@ -9,7 +9,7 @@
 
 %definex11ver  x710
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine with_dist_kernel
 %endif
 
@@ -267,6 +267,9 @@
 All persons listed below can be reached at 

SOURCES: file-debian.patch, file-sparc.patch - updated for 4.18

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 15:28:13 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 4.18

 Files affected:
SOURCES:
   file-debian.patch (1.14 - 1.15) , file-sparc.patch (1.3 - 1.4) 

 Diffs:


Index: SOURCES/file-debian.patch
diff -u SOURCES/file-debian.patch:1.14 SOURCES/file-debian.patch:1.15
--- SOURCES/file-debian.patch:1.14  Sun Mar 19 11:59:25 2006
+++ SOURCES/file-debian.patch   Mon Nov 13 16:28:07 2006
@@ -1,8 +1,8 @@
 file-4.15/doc/file.man.orig2005-08-18 17:18:22.0 +0200
-+++ file-4.15/doc/file.man 2005-08-28 22:16:00.615271312 +0200
+--- file-4.18/doc/file.man.orig2006-05-03 21:20:25.0 +0200
 file-4.18/doc/file.man 2006-11-13 16:15:03.159505000 +0100
 @@ -1,4 +1,4 @@
 -.TH FILE __CSECTION__ Copyright but distributable
-+.TH FILE __CSECTION__ August 2005 Copyrighted but distributable
++.TH FILE __CSECTION__ May 2006 Copyright but distributable
  .\ $Id$
  .SH NAME
  file
@@ -31,7 +31,7 @@
  magic file
  .I __MAGIC__.mgc ,
  or 
-@@ -368,12 +369,6 @@
+@@ -369,12 +370,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.
@@ -44,7 +44,7 @@
  .SH EXAMPLES
  .nf
  $ file file.c file /dev/{wd0a,hda}
-@@ -527,3 +522,7 @@
+@@ -528,3 +523,7 @@
  .B ftp.astron.com
  in the directory
  .I /pub/file/file-X.YZ.tar.gz
@@ -158,23 +158,23 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
 file-4.14/src/magic.c.debian   2005-06-25 17:52:14.0 +0200
-+++ file-4.14/src/magic.c  2005-07-14 09:43:18.0 +0200
-@@ -213,7 +213,7 @@
+--- file-4.18/src/magic.c.orig 2006-10-31 20:37:17.0 +0100
 file-4.18/src/magic.c  2006-11-13 16:15:31.219505000 +0100
+@@ -238,7 +238,7 @@
int fd = 0;
int rv = -1;
unsigned char *buf;
 -  struct stat sb;
 +  struct stat sb, *st = sb;
ssize_t nbytes = 0; /* number of bytes read from a datafile */
+   int ispipe = 0;
  
-   /*
-@@ -227,7 +227,7 @@
+@@ -253,7 +253,7 @@
if (file_reset(ms) == -1)
goto done;
  
 -  switch (file_fsmagic(ms, inname, sb)) {
 +  switch (file_fsmagic(ms, inname, st)) {
-   case -1:
+   case -1:/* error */
goto done;
-   case 0:
+   case 0: /* nothing found */


Index: SOURCES/file-sparc.patch
diff -u SOURCES/file-sparc.patch:1.3 SOURCES/file-sparc.patch:1.4
--- SOURCES/file-sparc.patch:1.3Thu Apr  3 09:22:02 2003
+++ SOURCES/file-sparc.patchMon Nov 13 16:28:08 2006
@@ -71,10 +71,9 @@
  12   string  \0 from '%s'
  32   belong  !0  (signal %d)
  
-diff -Nru file-4.02.bak/magic/Magdir/sun file-4.02/magic/Magdir/sun
 file-4.02.bak/magic/Magdir/sun Fri Feb  7 17:26:01 1997
-+++ file-4.02/magic/Magdir/sun Thu Apr  3 09:14:25 2003
-@@ -5,18 +5,18 @@
+--- file-4.18/magic/Magdir/sun.orig2006-06-14 00:17:00.0 +0200
 file-4.18/magic/Magdir/sun 2006-11-13 16:16:59.029505000 +0100
+@@ -5,7 +5,7 @@
  # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x
  # releases.  (5.x uses ELF.)
  #
@@ -83,14 +82,16 @@
  0byte0x80
  20  belong  4096   shared library
  20  belong  =4096   dynamically linked executable
- 20  belong  4096   dynamically linked executable
+@@ -13,12 +13,12 @@
  0byte^0x80   executable
  16   belong  0  not stripped
+ 
 -0 belong00600410 sparc pure
 +0 belong00600410 SPARC pure
  0byte0x80   dynamically linked executable
  0byte^0x80   executable
  16   belong  0  not stripped
+ 
 -0 belong00600407 sparc
 +0 belong00600407 SPARC
  0byte0x80   dynamically linked executable


 CVS-web:
http://cvs.pld-linux.org/SOURCES/file-debian.patch?r1=1.14r2=1.15f=u
http://cvs.pld-linux.org/SOURCES/file-sparc.patch?r1=1.3r2=1.4f=u

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


SPECS: file.spec - updated to 4.18, updated debian,sparc patches

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 15:28:48 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 4.18, updated debian,sparc patches

 Files affected:
SPECS:
   file.spec (1.118 - 1.119) 

 Diffs:


Index: SPECS/file.spec
diff -u SPECS/file.spec:1.118 SPECS/file.spec:1.119
--- SPECS/file.spec:1.118   Tue Sep 26 22:11:13 2006
+++ SPECS/file.spec Mon Nov 13 16:28:43 2006
@@ -28,12 +28,12 @@
 Summary(zh_CN):ĹĐś¨ÎÄźţŔŕĐ;̤žßĄŁ
 Summary(zh_TW):[EMAIL PROTECTED]
 Name:  file
-Version:   4.17
-Release:   4
+Version:   4.18
+Release:   1
 License:   distributable
 Group: Applications/File
 Source0:   ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 50919c65e0181423d66bb25d7fe7b0fd
+# Source0-md5: ce1aa9b0316feb57d40a48cfe6b606e4
 Source1:   zisofs.magic
 Source2:   
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5: c157a183b64156f8baafaefd9cbf04c1
@@ -361,6 +361,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.119  2006/11/13 15:28:43  qboosh
+- updated to 4.18, updated debian,sparc patches
+
 Revision 1.118  2006/09/26 20:11:13  wrobell
 - rel. 4 due to updated python bytecode related patch
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/file.spec?r1=1.118r2=1.119f=u

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


DISTFILES: file-4.18.tar.gz file-non-english-man-pages.tar.bz2

2006-11-13 Thread qboosh

Files fetched: 1

STORED: ftp://ftp.astron.com/pub/file/file-4.18.tar.gz
ce1aa9b0316feb57d40a48cfe6b606e4  file-4.18.tar.gz
Size: 536447 bytes
ALREADY GOT: 
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/file-non-english-man-pages.tar.bz2
c157a183b64156f8baafaefd9cbf04c1  file-non-english-man-pages.tar.bz2


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


SPECS: ash.spec, emotion.spec, jasper.spec, kchmviewer.spec, kdemu...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:38:11 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- don't use %{?without_...:...}, it may not work after inverting bcond

 Files affected:
SPECS:
   ash.spec (1.71 - 1.72) , emotion.spec (1.13 - 1.14) , jasper.spec (1.33 - 
1.34) , kchmviewer.spec (1.14 - 1.15) , kdemultimedia.spec (1.224 - 1.225) , 
oww.spec (1.6 - 1.7) , tora.spec (1.36 - 1.37) 

 Diffs:


Index: SPECS/ash.spec
diff -u SPECS/ash.spec:1.71 SPECS/ash.spec:1.72
--- SPECS/ash.spec:1.71 Thu Feb 17 00:24:38 2005
+++ SPECS/ash.spec  Mon Nov 13 16:38:04 2006
@@ -54,7 +54,7 @@
 %{?with_dietlibc:BuildRequires:dietlibc-devel}
 BuildRequires: flex
 %if %{with static}
-%{?without_uClibc:BuildRequires: glibc-static}
+%{!?with_uClibc:BuildRequires: glibc-static}
 %{?with_uClibc:BuildRequires: uClibc-static  2:0.9.27-1}
 %endif
 %{?with_uClibc:BuildRequires: uClibc-devel  2:0.9.27-1}
@@ -275,6 +275,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.72  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.71  2005/02/16 23:24:38  tommat
 - fixed with dietlibc bcond comment
 


Index: SPECS/emotion.spec
diff -u SPECS/emotion.spec:1.13 SPECS/emotion.spec:1.14
--- SPECS/emotion.spec:1.13 Mon Nov 13 15:54:48 2006
+++ SPECS/emotion.spec  Mon Nov 13 16:38:04 2006
@@ -101,8 +101,8 @@
 %{__automake}
 %configure \
%{!?with_static_libs:--disable-static} \
-   %{?without_gstreamer:--disable-gstreamer} \
-   %{?without_xine:--disable-xine}
+   %{!?with_gstreamer:--disable-gstreamer} \
+   %{!?with_xine:--disable-xine}
 %{__make}
 
 %install
@@ -159,6 +159,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.14  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.13  2006/11/13 14:54:48  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 


Index: SPECS/jasper.spec
diff -u SPECS/jasper.spec:1.33 SPECS/jasper.spec:1.34
--- SPECS/jasper.spec:1.33  Thu Nov  9 10:12:18 2006
+++ SPECS/jasper.spec   Mon Nov 13 16:38:04 2006
@@ -108,7 +108,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-%{?without_opengl:--disable-opengl} \
+%{!?with_opengl:--disable-opengl} \
--enable-shared
 
 %{__make}
@@ -157,6 +157,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.34  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.33  2006/11/09 09:12:18  jajcus
 - non-conditional glut-devel BR removed
 


Index: SPECS/kchmviewer.spec
diff -u SPECS/kchmviewer.spec:1.14 SPECS/kchmviewer.spec:1.15
--- SPECS/kchmviewer.spec:1.14  Mon Aug 21 18:11:59 2006
+++ SPECS/kchmviewer.spec   Mon Nov 13 16:38:04 2006
@@ -60,7 +60,7 @@
 %endif
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
%{?with_kde:--with-kde} \
-   %{?without_arts:--without-arts} \
+   %{!?with_arts:--without-arts} \
--with-qt-libraries=%{_libdir}
 %{__make}
 
@@ -89,6 +89,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.14  2006/08/21 16:11:59  maciek2w
 - updated to 2.6
 


Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.224 SPECS/kdemultimedia.spec:1.225
--- SPECS/kdemultimedia.spec:1.224  Mon Nov 13 15:56:53 2006
+++ SPECS/kdemultimedia.specMon Nov 13 16:38:04 2006
@@ -575,7 +575,7 @@
 %if %{_lib} == lib64
--enable-libsuffix=64 \
 %endif
-   --with%{?without_alsa:out}-arts-alsa \
+   --with%{!?with_alsa:out}-arts-alsa \
--with-extra-includes=%{_includedir}/speex \
--with-qt-libraries=%{_libdir} \
--with-distribution=PLD Linux Distribution \
@@ -963,6 +963,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.225  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.224  2006/11/13 14:56:53  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 


Index: SPECS/oww.spec
diff -u SPECS/oww.spec:1.6 SPECS/oww.spec:1.7
--- SPECS/oww.spec:1.6  Wed Apr 26 23:16:11 2006
+++ SPECS/oww.spec  Mon Nov 13 16:38:04 2006
@@ -51,8 +51,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-   

SPECS: qgit.spec - up to 1.5.3

2006-11-13 Thread arekm
Author: arekmDate: Mon Nov 13 15:40:14 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 1.5.3

 Files affected:
SPECS:
   qgit.spec (1.2 - 1.3) 

 Diffs:


Index: SPECS/qgit.spec
diff -u SPECS/qgit.spec:1.2 SPECS/qgit.spec:1.3
--- SPECS/qgit.spec:1.2 Sun Oct  8 14:28:44 2006
+++ SPECS/qgit.spec Mon Nov 13 16:40:09 2006
@@ -2,12 +2,12 @@
 Summary:   A git GUI viewer built on Qt
 Summary(pl):   Graficzna przeglądarka repozytorium git oparta o Qt
 Name:  qgit
-Version:   1.5.2
+Version:   1.5.3
 Release:   1
 License:   GPL
 Group: X11/Applications
 Source0:   http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2
-# Source0-md5: 251568da2d93b0e621ea7a2cb7de611d
+# Source0-md5: c1420385dc18716f0ab538756e7e2476
 Source1:   %{name}.desktop
 URL:   http://digilander.libero.it/mcostalba/
 BuildRequires: qt-devel
@@ -60,6 +60,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.3  2006/11/13 15:40:09  arekm
+- up to 1.5.3
+
 Revision 1.2  2006/10/08 12:28:44  qboosh
 - pl
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/qgit.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: qgit-1.5.3.tar.bz2

2006-11-13 Thread arekm

Files fetched: 1

STORED: http://dl.sourceforge.net/qgit/qgit-1.5.3.tar.bz2
c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2
Size: 190463 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


SPECS (LINUX_2_6_16): kernel.spec - don't use %{without ...}, it m...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:51:42 2006 GMT
Module: SPECS Tag: LINUX_2_6_16
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.41 - 1.441.2.1558.2.42) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.41 SPECS/kernel.spec:1.441.2.1558.2.42
--- SPECS/kernel.spec:1.441.2.1558.2.41 Sun Nov 12 22:57:03 2006
+++ SPECS/kernel.spec   Mon Nov 13 16:51:37 2006
@@ -30,7 +30,7 @@
 
 %{?debug:%define with_verbose 1}
 
-%if %{without grsecurity}
+%if !%{with grsecurity}
 %undefine  with_grsec_full
 %undefine  with_grsec_minimal
 %undefine  with_pax
@@ -1234,7 +1234,7 @@
 
 %depmod %{version}-%{release}%{xen}
 
-%if %{without xenU}
+%if !%{with xenU}
 /sbin/geninitrd -f --initrdfs=rom 
%{initrd_dir}/initrd-%{version}-%{release}%{xen}.gz %{version}-%{release}%{xen}
 mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2 
/dev/null  /dev/null
 ln -sf initrd-%{version}-%{release}%{xen}.gz %{initrd_dir}/initrd%{dashxen}
@@ -1308,7 +1308,7 @@
 
 %depmod %{version}-%{release}%{xen}smp
 
-%if %{without xenU}
+%if !%{with xenU}
 /sbin/geninitrd -f --initrdfs=rom 
%{initrd_dir}/initrd-%{version}-%{release}%{xen}smp.gz 
%{version}-%{release}%{xen}smp
 mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2 
/dev/null  /dev/null
 ln -sf initrd-%{version}-%{release}%{xen}smp.gz %{initrd_dir}/initrd%{dashxen}
@@ -1398,7 +1398,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}%{xen}/kernel/drivers/char/drm
 %endif
-%if %{have_oss}  %{have_isa}  %{without xen0}  %{without xenU}
+%if %{have_oss}  %{have_isa}  !%{with xen0}  !%{with xenU}
 %exclude 
/lib/modules/%{version}-%{release}%{xen}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 /lib/modules/%{version}-%{release}%{xen}/kernel/fs
@@ -1487,7 +1487,7 @@
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}%{xen}/kernel/sound/oss
-%if %{have_isa}  %{without xen0}  %{without xenU}
+%if %{have_isa}  !%{with xen0}  !%{with xenU}
 
/lib/modules/%{version}-%{release}%{xen}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
@@ -1514,7 +1514,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/char/drm
 %endif
-%if %{have_oss}  %{have_isa}  %{without xen0}  %{without xenU}
+%if %{have_oss}  %{have_isa}  !%{with xen0}  !%{with xenU}
 %exclude 
/lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 /lib/modules/%{version}-%{release}%{xen}smp/kernel/fs
@@ -1603,7 +1603,7 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}%{xen}smp/kernel/sound/oss
-%if %{have_isa}  %{without xen0}  %{without xenU}
+%if %{have_isa}  !%{with xen0}  !%{with xenU}
 
/lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
@@ -1689,6 +1689,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.42  2006/11/13 15:51:37  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.441.2.1558.2.41  2006/11/12 21:57:03  adamg
 - CVE notes for 2.6.16.31
 - changelog cosmetics


 CVS-web:

http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1558.2.41r2=1.441.2.1558.2.42f=u

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


SPECS (LINUX_2_6_17): kernel.spec - don't use %{without ...}, it m...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:52:24 2006 GMT
Module: SPECS Tag: LINUX_2_6_17
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   kernel.spec (1.441.2.1613.2.8 - 1.441.2.1613.2.9) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1613.2.8 SPECS/kernel.spec:1.441.2.1613.2.9
--- SPECS/kernel.spec:1.441.2.1613.2.8  Tue Oct 24 01:34:12 2006
+++ SPECS/kernel.spec   Mon Nov 13 16:52:18 2006
@@ -32,7 +32,7 @@
 
 %{?debug:%define with_verbose 1}
 
-%if %{without grsecurity}
+%if !%{with grsecurity}
 %undefine  with_grsec_full
 %undefine  with_grsec_minimal
 %undefine  with_pax
@@ -855,7 +855,7 @@
 
 %patch8 -p1
 
-%if %{without fbsplash}
+%if !%{with fbsplash}
 %patch3 -p1
 %else
 %patch4 -p1
@@ -1563,7 +1563,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
-%if %{without xen0}  %{without xenU}
+%if !%{with xen0}  !%{with xenU}
 %if %{have_oss}  %{have_isa}
 %exclude 
/lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1655,7 +1655,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound/oss
 
-%if %{without xen0}  %{without xenU}
+%if !%{with xen0}  !%{with xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1684,7 +1684,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
-%if %{without xen0}  %{without xenU}
+%if !%{with xen0}  !%{with xenU}
 %if %{have_oss}  %{have_isa}
 %exclude 
/lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1775,7 +1775,7 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound/oss
-%if %{without xen0}  %{without xenU}
+%if !%{with xen0}  !%{with xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
@@ -1866,6 +1866,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.441.2.1613.2.9  2006/11/13 15:52:18  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.441.2.1613.2.8  2006/10/23 23:34:12  mguevara
 - revert ide_acpi bcond to on - tested ok (with pax  grsecurity)
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1613.2.8r2=1.441.2.1613.2.9f=u

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


SPECS (LINUX_2_6): kernel.spec - don't use %{without ...}, it may ...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 15:53:09 2006 GMT
Module: SPECS Tag: LINUX_2_6
 Log message:
- don't use %{without ...}, it may not work after inverting bcond

 Files affected:
SPECS:
   kernel.spec (1.441.2.1657 - 1.441.2.1658) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1657 SPECS/kernel.spec:1.441.2.1658
--- SPECS/kernel.spec:1.441.2.1657  Mon Nov 13 12:26:01 2006
+++ SPECS/kernel.spec   Mon Nov 13 16:53:03 2006
@@ -35,7 +35,7 @@
 
 %{?debug:%define with_verbose 1}
 
-%if %{without grsecurity}
+%if !%{with grsecurity}
 %undefine  with_grsec_full
 %undefine  with_grsec_minimal
 %endif
@@ -844,7 +844,7 @@
 
 %patch8 -p1
 
-%if %{without fbsplash}
+%if !%{with fbsplash}
 %patch3 -p1
 %else
 %patch4 -p1
@@ -1764,6 +1764,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.441.2.1658  2006/11/13 15:53:03  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.441.2.1657  2006/11/13 11:26:01  czarny
 - few little things, that helped me build this kernel (as I need 2.6.18 for 
drivers of my new PC)
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1657r2=1.441.2.1658f=u

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


SPECS: qemu.spec - typo

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 16:11:20 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- typo

 Files affected:
SPECS:
   qemu.spec (1.62 - 1.63) 

 Diffs:


Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.62 SPECS/qemu.spec:1.63
--- SPECS/qemu.spec:1.62Mon Nov 13 13:38:10 2006
+++ SPECS/qemu.spec Mon Nov 13 17:11:15 2006
@@ -164,7 +164,7 @@
 cd kqemu-%{_kqemu_version}
 mv -f kqemu-linux.c{,.orig}
 %build_kernel_modules -m kqemu 'EOF'
-if grep -q CONFIG_PREEMPT_RT$ o/.config; then
+if grep -q CONFIG_PREEMPT_RT o/.config; then
sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \
kqemu-linux.c.orig  kqemu-linux.c
 else
@@ -282,6 +282,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.63  2006/11/13 16:11:15  sparky
+- typo
+
 Revision 1.62  2006/11/13 12:38:10  sparky
 - %{_alt_kernel} support
 - use %build_kernel_modules, %install_kernel_modules (not tested)


 CVS-web:
http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.62r2=1.63f=u

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


SOURCES: munin-plugins.patch - more plugins need group proc

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 16:15:01 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- more plugins need group proc

 Files affected:
SOURCES:
   munin-plugins.patch (1.14 - 1.15) 

 Diffs:


Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.14 SOURCES/munin-plugins.patch:1.15
--- SOURCES/munin-plugins.patch:1.14Mon Nov 13 15:57:54 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 17:14:56 2006
@@ -1,7 +1,7 @@
 diff -ur munin-1.3.2/dists/tarball/plugins.conf 
munin-1.3.2-plugins/dists/tarball/plugins.conf
 --- munin-1.3.2/dists/tarball/plugins.conf 2005-04-15 22:29:18.0 
+0200
 +++ munin-1.3.2-plugins/dists/tarball/plugins.conf 2005-10-09 
14:06:36.770701544 +0200
-@@ -29,3 +29,68 @@
+@@ -29,3 +29,74 @@
  
  [postfix*]
  user root
@@ -64,6 +64,12 @@
 +group proc
 +
 +[nfs*]
++group proc
++
++[entropy]
++group proc
++
++[open_*]
 +group proc
 +
 +[nut*]


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?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


SPECS: munin.spec - updated plugins patch - separated logrotate co...

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 16:16:48 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated plugins patch
- separated logrotate configs for client and server

 Files affected:
SPECS:
   munin.spec (1.40 - 1.41) 

 Diffs:


Index: SPECS/munin.spec
diff -u SPECS/munin.spec:1.40 SPECS/munin.spec:1.41
--- SPECS/munin.spec:1.40   Mon Nov 13 16:01:54 2006
+++ SPECS/munin.specMon Nov 13 17:16:43 2006
@@ -10,7 +10,7 @@
 Summary(pl):   Munin - agent danych RRD Linpro
 Name:  munin
 Version:   1.3.3
-Release:   0.1
+Release:   0.2
 License:   GPL
 Group: Daemons
 Source0:   http://dl.sourceforge.net/munin/%{name}_%{version}.tar.gz
@@ -19,6 +19,7 @@
 Source2:   %{name}.cron
 Source3:   %{name}-apache.conf
 Source4:   %{name}.logrotate
+Source5:   %{name}-node.logrotate
 Patch0:%{name}-Makefile.patch
 Patch1:%{name}-plugins.patch
 Patch2:%{name}-node-config.patch
@@ -113,6 +114,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/munin-node
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/munin
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/munin
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/munin-node
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
@@ -166,6 +168,7 @@
 %dir %{_sysconfdir}/templates
 %{_sysconfdir}/templates/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/logrotate.d/munin
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/apache.conf
 %attr(755,root,root) %{_sbindir}/munin-cron
 %attr(755,root,root) %{_datadir}/munin/munin-graph
@@ -195,7 +198,6 @@
 %attr(750,munin,root) %dir /var/log/munin
 %attr(750,munin,root) %dir /var/log/archiv/munin
 %attr(770,munin,munin) %dir /var/lib/munin
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/logrotate.d/munin
 
 %files node
 %defattr(644,root,root,755)
@@ -203,6 +205,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin-node.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/plugins.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/plugin-conf.d/munin-node
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/logrotate.d/munin-node
 %attr(754,root,root) /etc/rc.d/init.d/munin-node
 %attr(755,root,root) %{_sbindir}/munin-run
 %attr(755,root,root) %{_sbindir}/munin-node
@@ -226,6 +229,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.41  2006/11/13 16:16:43  baggins
+- updated plugins patch
+- separated logrotate configs for client and server
+
 Revision 1.40  2006/11/13 15:01:54  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.40r2=1.41f=u

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


SPECS: qemu.spec - kqemu: rename suplied .o to .o.bin so they won'...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 16:31:22 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- kqemu: rename suplied .o to .o.bin so they won't be deleted in make clean

 Files affected:
SPECS:
   qemu.spec (1.63 - 1.64) 

 Diffs:


Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.63 SPECS/qemu.spec:1.64
--- SPECS/qemu.spec:1.63Mon Nov 13 17:11:15 2006
+++ SPECS/qemu.spec Mon Nov 13 17:31:16 2006
@@ -162,7 +162,18 @@
 %build
 %if %{with kernel}
 cd kqemu-%{_kqemu_version}
+
+mv -f kqemu-mod-i386.o{,.bin}
+mv -f kqemu-mod-x86_64.o{,.bin}
 mv -f kqemu-linux.c{,.orig}
+cat  Makefile 'EOF'
+obj-m := kqemu.o
+kqemu-objs:= kqemu-linux.o kqemu-mod.o
+
+$(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o.bin
+cp $ $@
+EOF
+
 %build_kernel_modules -m kqemu 'EOF'
 if grep -q CONFIG_PREEMPT_RT o/.config; then
sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \
@@ -282,6 +293,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.64  2006/11/13 16:31:16  sparky
+- kqemu: rename suplied .o to .o.bin so they won't be deleted in make clean
+
 Revision 1.63  2006/11/13 16:11:15  sparky
 - typo
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.63r2=1.64f=u

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


SPECS: qemu.spec - tab

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 16:36:59 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- tab

 Files affected:
SPECS:
   qemu.spec (1.64 - 1.65) 

 Diffs:


Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.64 SPECS/qemu.spec:1.65
--- SPECS/qemu.spec:1.64Mon Nov 13 17:31:16 2006
+++ SPECS/qemu.spec Mon Nov 13 17:36:53 2006
@@ -171,7 +171,7 @@
 kqemu-objs:= kqemu-linux.o kqemu-mod.o
 
 $(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o.bin
-cp $ $@
+   cp $ $@
 EOF
 
 %build_kernel_modules -m kqemu 'EOF'
@@ -293,6 +293,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.65  2006/11/13 16:36:53  sparky
+- tab
+
 Revision 1.64  2006/11/13 16:31:16  sparky
 - kqemu: rename suplied .o to .o.bin so they won't be deleted in make clean
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.64r2=1.65f=u

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


SOURCES: munin-plugins.patch - proper use of echo is a hard thing...

2006-11-13 Thread baggins
Author: baggins  Date: Mon Nov 13 16:38:00 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- proper use of echo is a hard thing...

 Files affected:
SOURCES:
   munin-plugins.patch (1.15 - 1.16) 

 Diffs:


Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.15 SOURCES/munin-plugins.patch:1.16
--- SOURCES/munin-plugins.patch:1.15Mon Nov 13 17:14:56 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 17:37:55 2006
@@ -734,3 +734,46 @@
}
next unless grep { $_ } @fields;
  
+--- munin-1.3.3/node/node.d.linux/load.in~ 2006-11-10 13:39:13.0 
+0100
 munin-1.3.3/node/node.d.linux/load.in  2006-11-13 17:37:17.0 
+0100
+@@ -35,30 +35,30 @@
+   # one machine answer for several)
+ 
+   # The title of the graph
+-  echo 'graph_title Load average'
++  echo graph_title Load average
+   # Arguments to rrdtool graph. In this case, tell it that the
+   # lower limit of the graph is '0', and that 1k=1000 (not 1024)
+-  echo 'graph_args --base 1000 -l 0'
++  echo graph_args --base 1000 -l 0
+   # The Y-axis label
+-  echo 'graph_vlabel load'
++  echo graph_vlabel load
+   # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
+   # 420 milliload)
+-  echo 'graph_scale no'
++  echo graph_scale no
+   # Graph category. Defaults to 'other'
+-  echo 'graph_category system'
++  echo graph_category system
+   # The fields. label is used in the legend. label is the only
+   # required subfield. 
+-  echo 'load.label load'
++  echo load.label load
+   # These two are optional. They are only used if you have
+   # configured your munin to tell a Nagios-server about any
+   # problems
+-  echo 'load.warning $LOAD_WARN'
+-  echo 'load.critical $LOAD_CRIT'
++  echo load.warning $LOAD_WARN
++  echo load.critical $LOAD_CRIT
+   # This one is purely to add an explanation to the web page. The first
+   # one is for the graph itself, while the second one is for the field
+   # load.
+-  echo 'graph_info The load average of the machine describes how many 
processes are in the run-queue (scheduled to run immediately).'
+-  echo 'load.info Average load for the five minutes.'
++  echo graph_info The load average of the machine describes how many 
processes are in the run-queue (scheduled to run \immediately\).
++  echo load.info Average load for the five minutes.
+ 
+   # Last, if run with the config-parameter, quit here (don't
+   # display any data)


 CVS-web:
http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?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


SPECS: file.spec - check-files cleanup

2006-11-13 Thread glen
Author: glen Date: Mon Nov 13 16:56:58 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- check-files cleanup

 Files affected:
SPECS:
   file.spec (1.119 - 1.120) 

 Diffs:


Index: SPECS/file.spec
diff -u SPECS/file.spec:1.119 SPECS/file.spec:1.120
--- SPECS/file.spec:1.119   Mon Nov 13 16:28:43 2006
+++ SPECS/file.spec Mon Nov 13 17:56:53 2006
@@ -309,6 +309,9 @@
 
 ./src/file -m $RPM_BUILD_ROOT%{_datadir}/file/magic -c -C
 
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
+rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -361,6 +364,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.120  2006/11/13 16:56:53  glen
+- check-files cleanup
+
 Revision 1.119  2006/11/13 15:28:43  qboosh
 - updated to 4.18, updated debian,sparc patches
 
@@ -426,7 +432,7 @@
 
 Revision 1.100  2004/11/24 23:19:57  qboosh
 - updated to 4.12, removed obsolete mime-elf,readelf-fix,segv patches
--fixed typo which disabled dicom patch
+- fixed typo which disabled dicom patch
 
 Revision 1.99  2004/11/23 20:04:20  qboosh
 - added doc
@@ -509,7 +515,7 @@
 - mass commit: cosmetics (removed trailing white spaces)
 
 Revision 1.76  2003/08/11 20:44:54  ankry
-cosmetics
+- cosmetics
 
 Revision 1.75  2003/07/08 18:26:38  blues
 - f and some g letters of small fixes inpired by kloczek
@@ -591,22 +597,22 @@
 Revision 1.55  2002/05/23 00:27:32  kloczek
 - merge translations from Kondra,
 - added patches:
--- palm: Pilot Image Viewer pdb files (patch from Kondra),
--- mime-elf: regiter ELF files in magic.mime file (patch from Conectiva),
--- unicode: BOM prefixed text files (Adrian Havill [EMAIL PROTECTED]
-   (based on patch from TurboLinux),
--- mng: register mng files in mime.magick (patch from RH).
+  - palm: Pilot Image Viewer pdb files (patch from Kondra),
+  - mime-elf: regiter ELF files in magic.mime file (patch from Conectiva),
+  - unicode: BOM prefixed text files (Adrian Havill [EMAIL PROTECTED]
+(based on patch from TurboLinux),
+  - mng: register mng files in mime.magick (patch from RH).
 
 Revision 1.54  2002/05/21 23:13:01  kloczek
-perl -pi -e s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e s/^automake -a -c -f --foreing/\%\{__automake\}/; \
  s/^automake -a -c -f/\%\{__automake\}/; \
-s/^autoconf/\%\{__autoconf\}/
+ s/^autoconf/\%\{__autoconf\}/
 
 Revision 1.53  2002/05/20 07:48:40  pioklo
 - up to 3.38,STBR,remove patch5
 
 Revision 1.52  2002/04/25 16:18:01  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.51  2002/04/10 22:33:36  qboosh
 - added ac25x patch needed for autoconf 2.53; release 6
@@ -635,7 +641,7 @@
 - added man-pages tar URL
 
 Revision 1.44  2002/01/18 02:12:56  kloczek
-perl -pi -e s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/
+- perl -pi -e s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/
 
 Revision 1.43  2001/11/15 23:15:11  qboosh
 - added magic from mscompress package
@@ -646,7 +652,7 @@
 - revision 3
 
 Revision 1.41  2001/11/14 16:09:24  ankry
-- commented out manpage instalation id %%_datadir ...
+- commented out manpage instalation id %_datadir ...
   (Source2 does not seem to be a proper magic.mime also)
 
 Revision 1.40  2001/11/10 16:45:30  jajcus
@@ -693,10 +699,10 @@
 - release 3
 
 Revision 1.29  2001/03/15 18:24:54  wiget
-typo
+- typo
 
 Revision 1.28  2001/03/15 18:20:48  wiget
-make and install compiled magic file; release 2; stb
+- make and install compiled magic file; release 2; stb
 
 Revision 1.27  2001/03/13 08:28:39  wiget
 3.34
@@ -711,7 +717,7 @@
 - updated to 3.32.
 
 Revision 1.23  2000/06/09 07:22:50  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.22  2000/05/30 19:28:26  wiget
 3.31 and IA-64 fixes
@@ -734,22 +740,9 @@
 Revision 1.17  1999/11/01 21:24:29  kloczek
 - updated to 3.28,
 - removed file.gimp Source2 (integrated in current version),
-- redefined %%{_datadir} to %%{_prefix}/share/misc instead using fhs patch,
+- redefined %{_datadir} to %{_prefix}/share/misc instead using fhs patch,
 - added tfm and parc patches which based on patches from rawhide,
-- added using %%configure macro and DESTDIR style %install.
+- added using %configure macro and DESTDIR style %install.
 
 Revision 1.16  1999/07/12 23:05:56  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Mon May 31 1999 Wojtek Ślusarczyk [EMAIL PROTECTED]
-- FHS 2.0
-
-* Mon Apr 19 1999 Tomasz Kłoczko [EMAIL PROTECTED]
-  [3.26-5]
-- new xdelta magic description,
-- added patch for sparcv9,
-- recompiles on new rpm.
-
-* Thu Mar 11 1999 Tomasz Kłoczko [EMAIL PROTECTED]
-  [3.26-4]
-- removed man group from man pages.


 CVS-web:
http://cvs.pld-linux.org/SPECS/file.spec?r1=1.119r2=1.120f=u


SPECS: X11-driver-nvidia-legacy.spec - %{_alt_kernel} support

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 17:13:09 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support

 Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.33 - 1.34) 

 Diffs:


Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.33 
SPECS/X11-driver-nvidia-legacy.spec:1.34
--- SPECS/X11-driver-nvidia-legacy.spec:1.33Mon Nov 13 13:20:58 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Mon Nov 13 18:13:03 2006
@@ -35,7 +35,7 @@
 URL:   http://www.nvidia.com/object/linux.html
 BuildRequires: %{kgcc_package}
 #BuildRequires:X11-devel = %{_min_x11}# disabled for now
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.7}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.7}
 BuildRequires: rpmbuild(macros) = 1.326
 BuildRequires: sed = 4.0
 BuildConflicts:XFree86-nvidia
@@ -120,7 +120,7 @@
 %description progs -l pl
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
-%package -n kernel-video-nvidia-legacy
+%package -n kernel%{_alt_kernel}-video-nvidia-legacy
 Summary:   nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Moduł jądra dla obsługi kart graficznych nVidia
@@ -132,20 +132,20 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Provides:  X11-driver-nvidia(kernel)
 Obsoletes: XFree86-nvidia-kernel
-Obsoletes: kernel-video-nvidia  1.0.7174
-Conflicts: kernel-video-nvidia
+Obsoletes: kernel%{_alt_kernel}-video-nvidia  1.0.7174
+Conflicts: kernel%{_alt_kernel}-video-nvidia
 
-%description -n kernel-video-nvidia-legacy
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy
 nVidia Architecture support for Linux kernel.
 
-%description -n kernel-video-nvidia-legacy -l de
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 
-%description -n kernel-video-nvidia-legacy -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy -l pl
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla Xorg/XFree86.
 
-%package -n kernel-smp-video-nvidia-legacy
+%package -n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 Summary:   nVidia kernel module for nVidia Architecture support
 Summary(de):   Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):   Moduł jądra dla obsługi kart graficznych nVidia
@@ -156,16 +156,16 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Provides:  X11-driver-nvidia(kernel)
 Obsoletes: XFree86-nvidia-kernel
-Obsoletes: kernel-smp-video-nvidia  1.0.7174
-Conflicts: kernel-smp-video-nvidia
+Obsoletes: kernel%{_alt_kernel}-smp-video-nvidia  1.0.7174
+Conflicts: kernel%{_alt_kernel}-smp-video-nvidia
 
-%description -n kernel-smp-video-nvidia-legacy
+%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 nVidia Architecture support for Linux kernel SMP.
 
-%description -n kernel-smp-video-nvidia-legacy -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
 
-%description -n kernel-smp-video-nvidia-legacy -l pl
+%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy -l pl
 Obsługa architektury nVidia dla jądra Linuksa SMP. Pakiet wymagany
 przez sterownik nVidii dla Xorg/XFree86.
 
@@ -254,16 +254,16 @@
 
 %postun-p /sbin/ldconfig
 
-%post  -n kernel-video-nvidia-legacy
+%post  -n kernel%{_alt_kernel}-video-nvidia-legacy
 %depmod %{_kernel_ver}
 
-%postun-n kernel-video-nvidia-legacy
+%postun-n kernel%{_alt_kernel}-video-nvidia-legacy
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-video-nvidia-legacy
+%post  -n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 %depmod %{_kernel_ver}smp
 
-%postun-n kernel-smp-video-nvidia-legacy
+%postun-n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 %depmod %{_kernel_ver}smp
 
 %files
@@ -292,12 +292,12 @@
 %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
 
 %if %{with kernel}
-%files -n kernel-video-nvidia-legacy
+%files -n kernel%{_alt_kernel}-video-nvidia-legacy
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
 %if %{with smp}  %{with dist_kernel}
-%files -n kernel-smp-video-nvidia-legacy
+%files -n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*.ko*
 %endif
@@ -323,6 +323,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.34  2006/11/13 17:13:03  sparky
+- %{_alt_kernel} support
+
 Revision 1.33  2006/11/13 12:20:58  sparky
 - increase rpmbuild(macros) BR
 


 CVS-web:


SPECS: rt2500.spec - %{_alt_kernel} support - use %build_kernel_mo...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 17:29:12 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros

 Files affected:
SPECS:
   rt2500.spec (1.21 - 1.22) 

 Diffs:


Index: SPECS/rt2500.spec
diff -u SPECS/rt2500.spec:1.21 SPECS/rt2500.spec:1.22
--- SPECS/rt2500.spec:1.21  Wed Sep  6 15:48:33 2006
+++ SPECS/rt2500.spec   Mon Nov 13 18:29:06 2006
@@ -26,8 +26,8 @@
 Patch0:%{name}-qt.patch
 URL:   http://rt2x00.serialmonkey.com/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.7}
-BuildRequires: rpmbuild(macros) = 1.217
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.7}
+BuildRequires: rpmbuild(macros) = 1.329
 %endif
 %if %{with userspace}
 BuildRequires: pkgconfig
@@ -43,7 +43,7 @@
 Program do konfiguracji kart bezprzewodowych opartych na układzie
 RT2500.
 
-%package -n kernel-net-rt2500
+%package -n kernel%{_alt_kernel}-net-rt2500
 Summary:   Linux driver for WLAN cards based on RT2500
 Summary(pl):   Sterownik dla Linuksa do kart bezprzewodowych opartych na 
układzie RT2500
 Release:   [EMAIL PROTECTED]
@@ -54,18 +54,18 @@
 Requires(postun):  %releq_kernel_up
 %endif
 
-%description -n kernel-net-rt2500
+%description -n kernel%{_alt_kernel}-net-rt2500
 This is a Linux driver for WLAN cards based on RT2500.
 
 This package contains Linux module.
 
-%description -n kernel-net-rt2500 -l pl
+%description -n kernel%{_alt_kernel}-net-rt2500 -l pl
 Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
 RT2500.
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-net-rt2500
+%package -n kernel%{_alt_kernel}-smp-net-rt2500
 Summary:   Linux SMP driver for WLAN cards based on RT2500
 Summary(pl):   Sterownik dla Linuksa SMP do kart bezprzewodowych opartych na 
układzie RT2500
 Release:   [EMAIL PROTECTED]
@@ -76,12 +76,12 @@
 Requires(postun):  %releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-rt2500
+%description -n kernel%{_alt_kernel}-smp-net-rt2500
 This is a Linux driver for WLAN cards based on RT2500.
 
 This package contains Linux SMP module.
 
-%description -n kernel-smp-net-rt2500 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-rt2500 -l pl
 Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
 RT2500.
 
@@ -103,30 +103,7 @@
 %endif
 
 %if %{with kernel}
-# kernel module(s)
-cd Module
-
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv rt2500{,-$cfg}.ko
-done
-
+%build_kernel_modules -C Module -m rt2500
 %endif
 
 %install
@@ -137,30 +114,22 @@
 %endif
 
 %if %{with kernel}
-cd Module
-install -d 
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net/wireless
-install rt2500-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/rt2500.ko
-%if %{with smp}  %{with dist_kernel}
-install rt2500-smp.ko \
-   
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/rt2500.ko
-%endif
-cd -
+%install_kernel_modules -m Module/rt2500 -d kernel/drivers/net/wireless
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-net-rt2500
+%post -n kernel%{_alt_kernel}-net-rt2500
 %depmod %{_kernel_ver}
 
-%postun -n kernel-net-rt2500
+%postun -n kernel%{_alt_kernel}-net-rt2500
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-net-rt2500
+%post -n kernel%{_alt_kernel}-smp-net-rt2500
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-rt2500
+%postun -n kernel%{_alt_kernel}-smp-net-rt2500
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -171,12 +140,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-rt2500
+%files -n kernel%{_alt_kernel}-net-rt2500
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
 
 %if %{with smp}  %{with dist_kernel}
-%files -n kernel-smp-net-rt2500
+%files -n kernel%{_alt_kernel}-smp-net-rt2500
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/*.ko*
 

SVN: admin/dns/pld-linux.org.template

2006-11-13 Thread adamg
Author: adamg
Date: Mon Nov 13 18:44:29 2006
New Revision: 7979

Modified:
   admin/dns/pld-linux.org.template
Log:
- dropped backup-1.mx per arekm's suggestion

Modified: admin/dns/pld-linux.org.template
==
--- admin/dns/pld-linux.org.template(original)
+++ admin/dns/pld-linux.org.templateMon Nov 13 18:44:29 2006
@@ -1,7 +1,7 @@
 $TTL 30m
 $ORIGIN .
 pld-linux.org  IN SOA  ns1.pld-linux.org. hostmaster.pld-linux.org. (
-   2006111302 ; serial
+   2006111303 ; serial
1h ; refresh
30m; retry
7d ; expire
@@ -16,7 +16,6 @@
A   87.236.194.68
 $TTL 5m
 MX 0 b.mx.pld-linux.org.
-   MX  10 backup-1.mx.pld-linux.org.
 
 ; such spf records make things worse on badly configured smtp
 ; servers like interia.pl
@@ -186,8 +185,6 @@
 ;b.mx  5m  A   217.149.246.12
 b.mx   A   87.236.194.69
 
-backup-1.mxA   193.239.45.66
-
 lists  6m  MX  0 lists.pld-linux.org.
 ;lists 6m  A   217.149.246.4
 lists  A   87.236.194.82
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


DISTFILES: xsensors-0.50.tar.gz

2006-11-13 Thread megabajt

Files fetched: 1

STORED: http://www.linuxhardware.org/xsensors/xsensors-0.50.tar.gz
3c80057bf8cc2d2f9803a496e7bc6e78  xsensors-0.50.tar.gz
Size: 123323 bytes


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


DISTFILES: xfce4-wavelan-plugin-0.5.3.tar.bz2

2006-11-13 Thread megabajt

Files fetched: 1

STORED: 
http://goodies.xfce.org/releases/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.3.tar.bz2
7fb068184b08d6b5bd7bc6d7e4369971  xfce4-wavelan-plugin-0.5.3.tar.bz2
Size: 390842 bytes


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


DISTFILES: gnupg-2.0.0.tar.bz2

2006-11-13 Thread qboosh

Files fetched: 1

STORED: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.0.tar.bz2
13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2
Size: 3904270 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


SPECS: scute.spec - package xhtml docs - versioned runtime deps

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 17:48:09 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- package xhtml docs
- versioned runtime deps

 Files affected:
SPECS:
   scute.spec (1.1 - 1.2) 

 Diffs:


Index: SPECS/scute.spec
diff -u SPECS/scute.spec:1.1 SPECS/scute.spec:1.2
--- SPECS/scute.spec:1.1Mon Nov 13 15:25:42 2006
+++ SPECS/scute.specMon Nov 13 18:48:04 2006
@@ -17,6 +17,8 @@
 BuildRequires: libgpg-error-devel = 0.7
 BuildRequires: libtool
 Requires:  gnupg-smime = 1.9.6
+Requires:  libassuan = 1:0.9.0
+Requires:  libgpg-error = 0.7
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,7 +65,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO doc/website
 %attr(755,root,root) %{_libdir}/libscute.so.*.*.*
 %attr(755,root,root) %{_libdir}/libscute.so
 
@@ -73,5 +75,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/13 17:48:04  qboosh
+- package xhtml docs
+- versioned runtime deps
+
 Revision 1.1  2006/11/13 14:25:42  qboosh
 - new


 CVS-web:
http://cvs.pld-linux.org/SPECS/scute.spec?r1=1.1r2=1.2f=u

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


SPECS: rt2x00.spec - %{_alt_kernel} support - use %build_kernel_mo...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 18:01:51 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros
- added Makefile patch

 Files affected:
SPECS:
   rt2x00.spec (1.19 - 1.20) 

 Diffs:


Index: SPECS/rt2x00.spec
diff -u SPECS/rt2x00.spec:1.19 SPECS/rt2x00.spec:1.20
--- SPECS/rt2x00.spec:1.19  Wed Sep  6 15:48:33 2006
+++ SPECS/rt2x00.spec   Mon Nov 13 19:01:45 2006
@@ -21,9 +21,10 @@
 Source0:   http://rt2x00.serialmonkey.com/%{name}-cvs-daily.tar.gz
 # Source0-md5: 8f9aff9f03633d35e9bd21ead8a29706
 Patch0:%{name}-config.patch
+Patch1:%{name}-Makefile.patch
 URL:   http://rt2x00.serialmonkey.com/
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.17}
-BuildRequires: rpmbuild(macros) = 1.217
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.17}
+BuildRequires: rpmbuild(macros) = 1.326
 Requires(post,postun): /sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel_up
@@ -31,13 +32,15 @@
 %endif
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%definemodules 
80211,crc-itu-t,rate_control,rfkill,rt2400pci,rt2500pci,rt2500usb,rt61pci,rt73usb
+
 %description
 A configuartion tool for WLAN cards based on RT2x00 chipsets.
 
 %description -l pl
 Narzędzie konfiguracujne do kart WLAN opartych na układach RT2x00.
 
-%package -n kernel-net-rt2x00
+%package -n kernel%{_alt_kernel}-net-rt2x00
 Summary:   Linux kernel driver for WLAN cards based on RT2x00 chipsets
 Summary(pl):   Sterownik jądra Linuksa dla kart WLAN opartych na układach 
RT2x00
 Release:   [EMAIL PROTECTED]
@@ -48,13 +51,13 @@
 Requires(postun):  %releq_kernel_up
 %endif
 
-%description -n kernel-net-rt2x00
+%description -n kernel%{_alt_kernel}-net-rt2x00
 This is a Linux driver for WLAN cards based on RT2x00 chipsets.
 
-%description -n kernel-net-rt2x00 -l pl
+%description -n kernel%{_alt_kernel}-net-rt2x00 -l pl
 Sterownik jądra Linuksa dla kart WLAN opartych na układach RT2x00.
 
-%package -n kernel-smp-net-rt2x00
+%package -n kernel%{_alt_kernel}-smp-net-rt2x00
 Summary:   Linux SMP kernel driver for WLAN cards based on RT2x00 chipsets
 Summary(pl):   Sterownik jądra Linuksa SMP dla kart WLAN opartych na układach 
RT2x00
 Release:   [EMAIL PROTECTED]
@@ -65,12 +68,12 @@
 Requires(postun):  %releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-rt2x00
+%description -n kernel%{_alt_kernel}-smp-net-rt2x00
 This is a Linux driver for WLAN cards based on RT2x00 chipsets.
 
 This package contains Linux SMP module.
 
-%description -n kernel-smp-net-rt2x00 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-rt2x00 -l pl
 Sterownik jądra Linuksa dla kart WLAN opartych na układach RT2x00.
 
 Ten pakiet zawiera moduł jądra Linuksa SMP.
@@ -78,80 +81,38 @@
 %prep
 %setup -q -n %{name}-cvs-%{_snap}
 %patch0 -p1
+%patch1 -p1
 
 %build
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   rm -rf o/include
-   install -d o/include/{linux,config}
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%ifarch ppc ppc64
-   install -d o/include/asm
-   [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf 
%{_kernelsrcdir}/include/asm-powerpc/* o/include/asm
-   [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch}/ ] || ln -snf 
%{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
-%else
-   ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
-%endif
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   touch o/include/config/MARKER
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-   %{__make} clean \
-   KERNDIR=$PWD/o 
-   ./rt2x00_config.sh rt2x00_config.h
-   %{__make} -C %{_kernelsrcdir} modules \
-   KERNDIR=$PWD/o \
-   SUBDIRS=$PWD \
-%if %{_target_base_arch} != %{_arch}
-   ARCH=%{_target_base_arch} \
-   CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
-   HOSTCC=%{__cc} \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mkdir o-$cfg
-   mv *.ko o-$cfg/
-done
-cd -
+./rt2x00_config.sh rt2x00_config.h
+%build_kernel_modules -m %{modules}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d 
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net/wireless
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-if [ $cfg = up -o $cfg = nondist ]; then
-   ocfg=''
-else
-   ocfg=$cfg
-fi
-install o-$cfg/*.ko \
- 

SOURCES: rt2x00-Makefile.patch (NEW) - allow building it our way w...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 18:02:43 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- allow building it our way without specyfing useless variables

 Files affected:
SOURCES:
   rt2x00-Makefile.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/rt2x00-Makefile.patch
diff -u /dev/null SOURCES/rt2x00-Makefile.patch:1.1
--- /dev/null   Mon Nov 13 19:02:43 2006
+++ SOURCES/rt2x00-Makefile.patch   Mon Nov 13 19:02:38 2006
@@ -0,0 +1,23 @@
+diff -Nur rt2x00-cvs-2006082007.orig/Makefile 
rt2x00-cvs-2006082007.Makefile/Makefile
+--- rt2x00-cvs-2006082007.orig/Makefile2006-08-01 15:53:35.0 
+
 rt2x00-cvs-2006082007.Makefile/Makefile2006-11-13 17:53:35.0 
+
+@@ -23,7 +23,7 @@
+ # Set the enviroment variables.
+ #
+ ifndef SUBDIRS
+-  SUBDIRS=$(shell pwd)
++  SUBDIRS=$(M)
+ endif
+ 
+ ifdef KERNDIR
+@@ -51,8 +51,8 @@
+ #
+ # Include kernel and rt2x00 config.
+ #
+-include $(KERNEL_SOURCES)/.config
+-include $(SUBDIRS)/config
++include $(SYSOUT)/.config
++include $(M)/config
+ 
+ #
+ # Determine if and with what options the dscape stack should be build

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


SPECS: X11-driver-nvidia.spec - save binary nv-kernel.o file

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 18:22:45 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- save binary nv-kernel.o file

 Files affected:
SPECS:
   X11-driver-nvidia.spec (1.88 - 1.89) 

 Diffs:


Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.88 SPECS/X11-driver-nvidia.spec:1.89
--- SPECS/X11-driver-nvidia.spec:1.88   Mon Nov 13 15:51:45 2006
+++ SPECS/X11-driver-nvidia.specMon Nov 13 19:22:40 2006
@@ -206,6 +206,12 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
+cat  Makefile 'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+   cp $ $@
+EOF
+mv nv-kernel.o{,.bin}
 %build_kernel_modules -m nvidia
 %endif
 
@@ -350,6 +356,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.89  2006/11/13 18:22:40  sparky
+- save binary nv-kernel.o file
+
 Revision 1.88  2006/11/13 14:51:45  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.spec?r1=1.88r2=1.89f=u

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


SPECS: xsensors.spec (NEW) - new by Piotr Grymkowski carnage2 at ...

2006-11-13 Thread megabajt
Author: megabajt Date: Mon Nov 13 18:24:48 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- new by Piotr Grymkowski carnage2 at go2.pl

 Files affected:
SPECS:
   xsensors.spec (NONE - 1.1)  (NEW)

 Diffs:


Index: SPECS/xsensors.spec
diff -u /dev/null SPECS/xsensors.spec:1.1
--- /dev/null   Mon Nov 13 19:24:48 2006
+++ SPECS/xsensors.spec Mon Nov 13 19:24:43 2006
@@ -0,0 +1,65 @@
+# $Revision$, $Date$
+Summary:   Display all related information from motherboard sensors
+Summary(pl):   Program, który wyświetla informacje z czujników płyty głównej
+Name:  xsensors
+Version:   0.50
+Release:   1
+License:   GPL
+Group: X11/Applications
+Source0:   http://www.linuxhardware.org/xsensors/%{name}-%{version}.tar.gz
+# Source0-md5: 3c80057bf8cc2d2f9803a496e7bc6e78
+URL:   http://www.linuxhardware.org/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gtk+2-devel = 2:2.6.0
+BuildRequires: libtool
+BuildRequires: lm_sensors-devel = 2.9.1
+BuildRequires: pkgconfig
+Requires:  lm_sensors = 2.9.1
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Xsensors is a GTK+2 program designed to display all the related
+information from motherboard sensors.
+
+%description -l pl
+Jest to program napisany przy użyciu GTK+2 służący do wyświetlania
+informacji na temat stanu płyty głownej.
+
+%prep
+%setup -q
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+   DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS README TODO
+%attr(755,root,root) %{_bindir}/xsensors
+%dir %{_pixmapsdir}/xsensors
+%{_pixmapsdir}/xsensors/*.xpm
+
+%define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team [EMAIL PROTECTED]
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1  2006/11/13 18:24:43  megabajt
+- new by Piotr Grymkowski carnage2 at go2.pl
+

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


SPECS: gnutls.spec - updated to 1.4.5

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 18:30:43 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 1.4.5

 Files affected:
SPECS:
   gnutls.spec (1.68 - 1.69) 

 Diffs:


Index: SPECS/gnutls.spec
diff -u SPECS/gnutls.spec:1.68 SPECS/gnutls.spec:1.69
--- SPECS/gnutls.spec:1.68  Mon Sep 25 21:08:32 2006
+++ SPECS/gnutls.spec   Mon Nov 13 19:30:38 2006
@@ -2,17 +2,17 @@
 Summary:   The GNU Transport Layer Security Library
 Summary(pl):   Biblioteka GNU TLS (Transport Layer Security)
 Name:  gnutls
-Version:   1.4.4
+Version:   1.4.5
 Release:   1
 License:   LGPL
 Group: Libraries
 Source0:   ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
-# Source0-md5: de5e060eeb2da36654e9e8af6b8b012a
+# Source0-md5: 30b8449e079c50a952926fd288dc6773
 Patch0:%{name}-info.patch
 URL:   http://www.gnu.org/software/gnutls/
 BuildRequires: autoconf = 2.60
 BuildRequires: automake = 1:1.9
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel = 0.14.5
 BuildRequires: libcfg+-devel
 BuildRequires: libgcrypt-devel = 1.2.2
 BuildRequires: libtasn1-devel = 0.3.4
@@ -138,6 +138,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.69  2006/11/13 18:30:38  qboosh
+- updated to 1.4.5
+
 Revision 1.68  2006/09/25 19:08:32  qboosh
 - updated to 1.4.4 (fixes CVE-2006-4790)
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/gnutls.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


SPECS: xfce4-wavelan-plugin.spec - up to 0.5.3 by Piotr Grymkowski...

2006-11-13 Thread megabajt
Author: megabajt Date: Mon Nov 13 19:00:54 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 0.5.3 by Piotr Grymkowski carnage2 at go2.pl

 Files affected:
SPECS:
   xfce4-wavelan-plugin.spec (1.7 - 1.8) 

 Diffs:


Index: SPECS/xfce4-wavelan-plugin.spec
diff -u SPECS/xfce4-wavelan-plugin.spec:1.7 SPECS/xfce4-wavelan-plugin.spec:1.8
--- SPECS/xfce4-wavelan-plugin.spec:1.7 Wed Mar  9 10:09:51 2005
+++ SPECS/xfce4-wavelan-plugin.spec Mon Nov 13 20:00:49 2006
@@ -2,16 +2,21 @@
 Summary:   A wavelan plugin for the Xfce panel
 Summary(pl):   Wtyczka sieci radiowych dla panelu Xfce
 Name:  xfce4-wavelan-plugin
-Version:   0.4.1
-Release:   2
+Version:   0.5.3
+Release:   1
 License:   GPL
 Group: X11/Applications
-Source0:   
http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-# Source0-md5: 0467e03696e88c4a8c81873e907a3972
-URL:   http://xfce-goodies.berlios.de/
+Source0:   
http://goodies.xfce.org/releases/xfce4-wavelan-plugin/%{name}-%{version}.tar.bz2
+# Source0-md5: 7fb068184b08d6b5bd7bc6d7e4369971
+URL:   
http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: perl-XML-Parser
+BuildRequires: perl-modules
 BuildRequires: pkgconfig
-BuildRequires: xfce4-panel-devel = 4.0.0
-Requires:  xfce4-panel = 4.0.0
+BuildRequires: xfce4-panel-devel = 4.3.90.2
+Requires:  xfce4-panel = 4.3.90.2
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,6 +31,11 @@
 %setup -q
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
--disable-static
 
@@ -39,13 +49,16 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.so
+%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -53,6 +66,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 19:00:49  megabajt
+- up to 0.5.3 by Piotr Grymkowski carnage2 at go2.pl
+
 Revision 1.7  2005/03/09 09:09:51  havner
 - rel up for rebuild with xfce 4.2
 
@@ -70,4 +86,3 @@
 
 Revision 1.2  2004/07/13 18:32:39  qboosh
 - cosmetics, Log fix
-


 CVS-web:
http://cvs.pld-linux.org/SPECS/xfce4-wavelan-plugin.spec?r1=1.7r2=1.8f=u

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


SPECS: X11-driver-nvidia-legacy.spec - save binary nv-kernel.o file

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 19:04:17 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- save binary nv-kernel.o file

 Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.34 - 1.35) 

 Diffs:


Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.34 
SPECS/X11-driver-nvidia-legacy.spec:1.35
--- SPECS/X11-driver-nvidia-legacy.spec:1.34Mon Nov 13 18:13:03 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Mon Nov 13 20:04:11 2006
@@ -190,6 +190,12 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
+cat  Makefile 'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+   cp $ $@
+EOF
+mv nv-kernel.o{,.bin}
 %build_kernel_modules -m nvidia
 %endif
 
@@ -323,6 +329,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.35  2006/11/13 19:04:11  sparky
+- save binary nv-kernel.o file
+
 Revision 1.34  2006/11/13 17:13:03  sparky
 - %{_alt_kernel} support
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.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


SPECS: xorg-driver-video-nvidia-legacy.spec - save binary nv-kerne...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 19:04:55 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- save binary nv-kernel.o file

 Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.8 - 1.9) 

 Diffs:


Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.8 
SPECS/xorg-driver-video-nvidia-legacy.spec:1.9
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.8  Mon Nov 13 13:27:13 2006
+++ SPECS/xorg-driver-video-nvidia-legacy.spec  Mon Nov 13 20:04:50 2006
@@ -178,6 +178,12 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
+cat  Makefile 'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+   cp $ $@
+EOF
+mv nv-kernel.o{,.bin}
 %build_kernel_modules -m nvidia
 %endif
 
@@ -305,6 +311,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.9  2006/11/13 19:04:50  sparky
+- save binary nv-kernel.o file
+
 Revision 1.8  2006/11/13 12:27:13  sparky
 - %{_alt_kernel} support
 - use %build_kernel_modules, %install_kernel_modules (not tested)


 CVS-web:

http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.8r2=1.9f=u

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


SPECS: xorg-driver-video-nvidia.spec - save binary nv-kernel.o file

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 19:05:33 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- save binary nv-kernel.o file

 Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.84 - 1.85) 

 Diffs:


Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.84 
SPECS/xorg-driver-video-nvidia.spec:1.85
--- SPECS/xorg-driver-video-nvidia.spec:1.84Mon Nov 13 13:24:02 2006
+++ SPECS/xorg-driver-video-nvidia.spec Mon Nov 13 20:05:27 2006
@@ -191,6 +191,12 @@
 %if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
+cat  Makefile 'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+   cp $ $@
+EOF
+mv nv-kernel.o{,.bin}
 %build_kernel_modules -m nvidia
 %endif
 
@@ -324,6 +330,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.85  2006/11/13 19:05:27  sparky
+- save binary nv-kernel.o file
+
 Revision 1.84  2006/11/13 12:24:02  sparky
 - use %build_kernel_modules, %install_kernel_modules (not tested)
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia.spec?r1=1.84r2=1.85f=u

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


SPECS: gnupg2.spec - up to 2.0.0; release 0.1 (see todo)

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 19:28:31 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 2.0.0; release 0.1 (see todo)

 Files affected:
SPECS:
   gnupg2.spec (1.48 - 1.49) 

 Diffs:


Index: SPECS/gnupg2.spec
diff -u SPECS/gnupg2.spec:1.48 SPECS/gnupg2.spec:1.49
--- SPECS/gnupg2.spec:1.48  Mon Oct 30 01:41:16 2006
+++ SPECS/gnupg2.spec   Mon Nov 13 20:28:26 2006
@@ -10,12 +10,12 @@
 Summary:   GNU Privacy Guard - tool for secure communication and data 
storage - development version
 Summary(pl):   GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego 
przechowywania danych - wersja rozwojowa
 Name:  gnupg2
-Version:   1.9.94
-Release:   1
+Version:   2.0.0
+Release:   0.1
 License:   GPL
 Group: Applications/File
-Source0:   ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: 1da8c928948800efa2a13d4aecb8d013
+Source0:   ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+# Source0-md5: 13c0d43bd1f4a129de470dda20192284
 Source1:   gnupg-agent.sh
 Patch0:%{name}-info.patch
 Patch1:%{name}-pth.patch
@@ -140,16 +140,10 @@
 %{__autoheader}
 %{__automake}
 %configure \
-   --with-capabilities \
%{!?with_pth:--disable-threads} \
--enable-gpg \
-%ifarch sparc sparc64
-   --disable-m-guard \
-%else
-   --enable-m-guard \
-%endif
-   --without-included-gettext \
-   --disable-m-debug \
+   --enable-symcryptrun \
+   --with-capabilities \
--with-mailprog=/usr/lib/sendmail
 
 %{__make}
@@ -196,12 +190,6 @@
 %attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
 %{_mandir}/man1/gpg2.1*
 %{_mandir}/man1/gpgv2.1*
-# conflicts with gnupg 1.4.x
-#%attr(755,root,root) %{_bindir}/gpg-zip
-#%attr(755,root,root) %{_bindir}/gpgsplit
-#%{_mandir}/man7/gnupg.7*
-# program not built by default
-#%{_mandir}/man1/symcryptrun.1*
 
 %files common -f gnupg2.lang
 %defattr(644,root,root,755)
@@ -236,12 +224,14 @@
 %doc agent-ChangeLog scd-ChangeLog
 %attr(755,root,root) %{_bindir}/gpg-agent
 %attr(755,root,root) %{_bindir}/scdaemon
+%attr(755,root,root) %{_bindir}/symcryptrun
 %attr(755,root,root) %{_libexecdir}/gpg-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
 %attr(755,root,root) %{_libexecdir}/pcsc-wrapper
 %{_mandir}/man1/gpg-agent.1*
 %{_mandir}/man1/gpg-preset-passphrase.1*
 %{_mandir}/man1/scdaemon.1*
+%{_mandir}/man1/symcryptrun.1*
 
 %files -n gnupg-agent-profile_d
 %defattr(644,root,root,755)
@@ -257,6 +247,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.49  2006/11/13 19:28:26  qboosh
+- up to 2.0.0; release 0.1 (see todo)
+
 Revision 1.48  2006/10/30 00:41:16  qboosh
 - updated to 1.9.94
 - added ac patch; full ac/am/gt regeneration instead of partial, broken one


 CVS-web:
http://cvs.pld-linux.org/SPECS/gnupg2.spec?r1=1.48r2=1.49f=u

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


SPECS: rpm-build-macros.spec - updated to 1.329 (erlier it faild t...

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 19:42:02 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 1.329 (erlier it faild to build)

 Files affected:
SPECS:
   rpm-build-macros.spec (1.88 - 1.89) 

 Diffs:


Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.88 SPECS/rpm-build-macros.spec:1.89
--- SPECS/rpm-build-macros.spec:1.88Sat Nov 11 15:34:33 2006
+++ SPECS/rpm-build-macros.spec Mon Nov 13 20:41:56 2006
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%definerpm_macros_rev 1.326
+%definerpm_macros_rev 1.329
 Summary:   PLD Linux RPM build macros
 Summary(pl):   Makra do budowania pakietów RPM dla Linuksa PLD
 Name:  rpm-build-macros
@@ -54,6 +54,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.89  2006/11/13 19:41:56  shadzik
+- updated to 1.329 (erlier it faild to build)
+
 Revision 1.88  2006/11/11 14:34:33  sparky
 - 1.326 (%build_kernel_modules and %install_kernel_modules)
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/rpm-build-macros.spec?r1=1.88r2=1.89f=u

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


CVSROOT: users - e-mail changed (back to o2 - seems more reliable)

2006-11-13 Thread twittner
Author: twittner Date: Mon Nov 13 19:57:52 2006 GMT
Module: CVSROOT   Tag: HEAD
 Log message:
- e-mail changed (back to o2 - seems more reliable)

 Files affected:
CVSROOT:
   users (1.481 - 1.482) 

 Diffs:


Index: CVSROOT/users
diff -u CVSROOT/users:1.481 CVSROOT/users:1.482
--- CVSROOT/users:1.481 Wed Nov  8 23:11:28 2006
+++ CVSROOT/users   Mon Nov 13 20:57:47 2006
@@ -223,7 +223,7 @@
 troll:[EMAIL PROTECTED]:Michał Chruszcz:[EMAIL PROTECTED]
 tsca:[EMAIL PROTECTED]:Tomasz Sienicki
 tumash:[EMAIL PROTECTED]:Tomasz Staniak
-twittner:[EMAIL PROTECTED]:Tomasz Wittner:[EMAIL PROTECTED]
+twittner:[EMAIL PROTECTED]:Tomasz Wittner:[EMAIL PROTECTED]
 undefine:[EMAIL PROTECTED]:Andrzej Dopierała:[EMAIL PROTECTED]
 vip:[EMAIL PROTECTED]:Piotr Budny:[EMAIL PROTECTED]
 waszi:[EMAIL PROTECTED]:Bartosz Waszak


 CVS-web:
http://cvs.pld-linux.org/CVSROOT/users?r1=1.481r2=1.482f=u

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


SPECS: unionfs.spec - %{_alt_kernel} support - use %build_kernel_m...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:03:43 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros

 Files affected:
SPECS:
   unionfs.spec (1.23 - 1.24) 

 Diffs:


Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.23 SPECS/unionfs.spec:1.24
--- SPECS/unionfs.spec:1.23 Mon Nov 13 16:04:12 2006
+++ SPECS/unionfs.spec  Mon Nov 13 21:03:37 2006
@@ -32,11 +32,11 @@
 Source0:   
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/%{name}-%{version}.tar.gz
 # Source0-md5: 2a8c6ef320efc43af91074ab47046f09
 Patch0:%{name}-build.patch
-Patch1:%{name}-vserver.patch
+#Patch1:   %{name}-vserver.patch
 URL:   http://www.filesystems.org/project-unionfs.html
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.16}
-BuildRequires: rpmbuild(macros) = 1.217
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.16}
+BuildRequires: rpmbuild(macros) = 1.326
 %endif
 BuildRequires: libuuid-devel
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,7 +60,7 @@
 odczytu i zapisu, a także wstawianie i usuwanie gałęzi w dowolnym
 miejscu.
 
-%package -n kernel-fs-unionfs
+%package -n kernel%{_alt_kernel}-fs-unionfs
 Summary:   Linux driver for unionfs
 Summary(pl):   Sterownik Linuksa dla unionfs
 Release:   [EMAIL PROTECTED]
@@ -71,13 +71,13 @@
 Requires(postun):  %releq_kernel_up
 %endif
 
-%description -n kernel-fs-unionfs
+%description -n kernel%{_alt_kernel}-fs-unionfs
 Linux driver for unionfs.
 
-%description -n kernel-fs-unionfs -l pl
+%description -n kernel%{_alt_kernel}-fs-unionfs -l pl
 Sterownik Linuksa dla unionfs.
 
-%package -n kernel-smp-fs-unionfs
+%package -n kernel%{_alt_kernel}-smp-fs-unionfs
 Summary:   Linux SMP driver for unionfs
 Summary(pl):   Sterownik Linuksa SMP dla unionfs
 Release:   [EMAIL PROTECTED]
@@ -86,52 +86,23 @@
 %requires_releq_kernel_smp
 Requires(postun):  %releq_kernel_smp
 %endif
-Provides:  kernel-unionfs = [EMAIL PROTECTED]
+Provides:  kernel%{_alt_kernel}-unionfs = [EMAIL PROTECTED]
 
-%description -n kernel-smp-fs-unionfs
+%description -n kernel%{_alt_kernel}-smp-fs-unionfs
 Linux SMP driver unionfs.
 
-%description -n kernel-smp-fs-unionfs -l pl
+%description -n kernel%{_alt_kernel}-smp-fs-unionfs -l pl
 Sterownik Linuksa SMP dla unionfs.
 
 %prep
 %setup -q %{?_snap:-n %{name}-%{_snap}}
 %patch0 -p1
-%{?with_vserver:%patch1 -p1}
+#%{?with_vserver:%patch1 -p1}
 
 %build
 %if %{with kernel}
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} 
up}%{!?with_dist_kernel:nondist}; do
-   if [ ! -r %{_kernelsrcdir}/config-$cfg ]; then
-   exit 1
-   fi
-   install -d o/include/linux
-   ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-   ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-   ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
o/include/linux/autoconf.h
-%if %{with dist_kernel}
-   %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-   install -d o/include/config
-   touch o/include/config/MARKER
-   ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-
-   %{__make} -C %{_kernelsrcdir} clean \
-   RCS_FIND_IGNORE=-name '*.ko' -o \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   %{__make} -C %{_kernelsrcdir} modules \
-   CC=%{__cc} CPP=%{__cpp} \
-   EXTRACFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR \
-   SYSSRC=%{_kernelsrcdir} \
-   SYSOUT=$PWD/o \
-   M=$PWD O=$PWD/o \
-   %{?with_verbose:V=1}
-   mv unionfs{,-$cfg}.ko
-done
+%build_kernel_modules -m unionfs \
+   EXTRA_CFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR
 %endif
 
 %if %{with userspace}
@@ -144,13 +115,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs
-install unionfs-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/unionfs.ko
-%if %{with smp}  %{with dist_kernel}
-install unionfs-smp.ko \
-   $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/unionfs.ko
-%endif
+%install_kernel_modules -m unionfs -d kernel/fs
 %endif
 
 %if %{with userspace}
@@ -162,16 +127,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-fs-unionfs
+%post -n kernel%{_alt_kernel}-fs-unionfs
 %depmod %{_kernel_ver}
 
-%postun -n kernel-fs-unionfs
+%postun -n kernel%{_alt_kernel}-fs-unionfs
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-fs-unionfs
+%post -n kernel%{_alt_kernel}-smp-fs-unionfs
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-fs-unionfs
+%postun -n 

SPECS: openct.spec - fixed build with automake 1.10, disable rpath

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 20:05:52 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- fixed build with automake 1.10, disable rpath

 Files affected:
SPECS:
   openct.spec (1.29 - 1.30) 

 Diffs:


Index: SPECS/openct.spec
diff -u SPECS/openct.spec:1.29 SPECS/openct.spec:1.30
--- SPECS/openct.spec:1.29  Mon Nov 13 13:21:16 2006
+++ SPECS/openct.spec   Mon Nov 13 21:05:47 2006
@@ -13,6 +13,8 @@
 URL:   http://www.opensc-project.org/openct/
 BuildRequires: autoconf = 2.52
 BuildRequires: automake
+# just for config.rpath (required by aclocal/lib-link.m4)
+BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: libusb-devel
 BuildRequires: pcsc-lite-devel
@@ -88,6 +90,8 @@
 %prep
 %setup -q
 
+cp -f /usr/share/gettext/config.rpath .
+
 %build
 %{__libtoolize}
 %{__aclocal} -I aclocal
@@ -95,6 +99,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+   --disable-rpath \
--with-bundle-dir=%{_libdir}/pcsc/drivers
 %{__make}
 
@@ -182,6 +187,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.30  2006/11/13 20:05:47  qboosh
+- fixed build with automake 1.10, disable rpath
+
 Revision 1.29  2006/11/13 12:21:16  qboosh
 - updated to 0.6.10
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/openct.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


SPECS: unionfs.spec - up to 1.3 (for 2.6.17)

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:13:13 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 1.3 (for 2.6.17)

 Files affected:
SPECS:
   unionfs.spec (1.24 - 1.25) 

 Diffs:


Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.24 SPECS/unionfs.spec:1.25
--- SPECS/unionfs.spec:1.24 Mon Nov 13 21:03:37 2006
+++ SPECS/unionfs.spec  Mon Nov 13 21:13:08 2006
@@ -24,18 +24,20 @@
 Summary:   A Stackable Unification File System
 Summary(pl):   Stakowalny, unifikujący system plików
 Name:  unionfs
-Version:   1.2
+Version:   1.3
 Release:   %{?_snap:0.%(echo %{_snap} | tr - _).}%{_rel}
 License:   GPL v2
 Group: Base/Kernel
 #Source0:  
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/snapshots/%{name}-%{_snap}.tar.gz
 Source0:   
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/%{name}-%{version}.tar.gz
-# Source0-md5: 2a8c6ef320efc43af91074ab47046f09
+# Source0-md5: af5106f29fb0ddb12b028f522fa0463c
 Patch0:%{name}-build.patch
 #Patch1:   %{name}-vserver.patch
 URL:   http://www.filesystems.org/project-unionfs.html
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.16}
+%if %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.17
+BuildRequires: kernel%{_alt_kernel}-module-build  3:2.6.18
 BuildRequires: rpmbuild(macros) = 1.326
 %endif
 BuildRequires: libuuid-devel
@@ -102,7 +104,7 @@
 %build
 %if %{with kernel}
 %build_kernel_modules -m unionfs \
-   EXTRA_CFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR
+   EXTRACFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR
 %endif
 
 %if %{with userspace}
@@ -165,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.25  2006/11/13 20:13:08  sparky
+- up to 1.3 (for 2.6.17)
+
 Revision 1.24  2006/11/13 20:03:37  sparky
 - %{_alt_kernel} support
 - use %build_kernel_modules, %install_kernel_modules macros


 CVS-web:
http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.24r2=1.25f=u

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


DISTFILES: unionfs-1.3.tar.gz

2006-11-13 Thread sparky

Files fetched: 1

STORED: ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.3.tar.gz
af5106f29fb0ddb12b028f522fa0463c  unionfs-1.3.tar.gz
Size: 162909 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


SPECS (LINUX_2_6_16): unionfs.spec - fixed

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:16:28 2006 GMT
Module: SPECS Tag: LINUX_2_6_16
 Log message:
- fixed

 Files affected:
SPECS:
   unionfs.spec (1.24 - 1.24.2.1) 

 Diffs:


Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.24 SPECS/unionfs.spec:1.24.2.1
--- SPECS/unionfs.spec:1.24 Mon Nov 13 21:03:37 2006
+++ SPECS/unionfs.spec  Mon Nov 13 21:16:23 2006
@@ -35,7 +35,9 @@
 #Patch1:   %{name}-vserver.patch
 URL:   http://www.filesystems.org/project-unionfs.html
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.16}
+%if %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.16
+BuildRequires: kernel%{_alt_kernel}-module-build  3:2.6.17
 BuildRequires: rpmbuild(macros) = 1.326
 %endif
 BuildRequires: libuuid-devel
@@ -102,7 +104,7 @@
 %build
 %if %{with kernel}
 %build_kernel_modules -m unionfs \
-   EXTRA_CFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR
+   EXTRACFLAGS=-DUNIONFS_NDEBUG -DUNIONFS_XATTR
 %endif
 
 %if %{with userspace}
@@ -165,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.24.2.1  2006/11/13 20:16:23  sparky
+- fixed
+
 Revision 1.24  2006/11/13 20:03:37  sparky
 - %{_alt_kernel} support
 - use %build_kernel_modules, %install_kernel_modules macros


 CVS-web:
http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.24r2=1.24.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


SOURCES: squid_hit_miss_mark.patch - updated for Squid 2.6

2006-11-13 Thread dzeus
Author: dzeusDate: Mon Nov 13 20:25:02 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for Squid 2.6

 Files affected:
SOURCES:
   squid_hit_miss_mark.patch (1.2 - 1.3) 

 Diffs:


Index: SOURCES/squid_hit_miss_mark.patch
diff -u SOURCES/squid_hit_miss_mark.patch:1.2 
SOURCES/squid_hit_miss_mark.patch:1.3
--- SOURCES/squid_hit_miss_mark.patch:1.2   Mon Sep 26 14:03:07 2005
+++ SOURCES/squid_hit_miss_mark.patch   Mon Nov 13 21:24:57 2006
@@ -1,56 +1,54 @@
-diff -ur squid-2.5.STABLE11.orig/src/client_side.c 
squid-2.5.STABLE11/src/client_side.c
 squid-2.5.STABLE11.orig/src/client_side.c  2005-09-15 11:53:28.0 
+0200
-+++ squid-2.5.STABLE11/src/client_side.c   2005-09-26 13:41:06.749747464 
+0200
-@@ -2072,6 +2072,9 @@
-   /* Avoid copying to MemBuf for non-range requests */
-   /* Note, if we're here, then 'rep' is known to be NULL */
-   http-out.offset += body_size;
-+  {   int tos=isTcpHit(http-log_type) ? 0 : 8;
-+  setsockopt(fd,SOL_IP,IP_TOS,tos,4);
-+  }
-   comm_write(fd, buf, size, clientWriteBodyComplete, http, NULL);
-   /* NULL because clientWriteBodyComplete frees it */
-   return;
-@@ -2129,6 +2132,9 @@
- if (!http-request-range  http-request-method == METHOD_GET)
-   assert(check_size == size);
+diff -urN squid-2.6.STABLE5.orig/src/client_side.c 
squid-2.6.STABLE5/src/client_side.c
+--- squid-2.6.STABLE5.orig/src/client_side.c   2006-09-30 23:10:48.0 
+0200
 squid-2.6.STABLE5/src/client_side.c2006-11-13 21:13:45.241328717 
+0100
+@@ -2948,6 +2948,9 @@
+   memBufAppend(mb, body_buf, body_size);
+ }
  /* write */
 +{ int tos=isTcpHit(http-log_type) ? 0 : 8;
 +  setsockopt(fd,SOL_IP,IP_TOS,tos,4);
 +}
- comm_write_mbuf(fd, mb, clientWriteComplete, http);
- /* if we don't do it, who will? */
- memFree(buf, MEM_CLIENT_SOCK_BUF);
-diff -ur squid-2.5.STABLE11.orig/src/defines.h squid-2.5.STABLE11/src/defines.h
 squid-2.5.STABLE11.orig/src/defines.h  2005-03-26 03:50:52.0 
+0100
-+++ squid-2.5.STABLE11/src/defines.h   2005-09-26 13:41:06.752747008 +0200
+ comm_write_mbuf(http-conn-fd, mb, clientWriteComplete, http);
+ /* clean up */
+   aborted:
+@@ -3000,6 +3003,9 @@
+ if (!http-request-range) {
+   /* Avoid copying to MemBuf for non-range requests */
+   http-out.offset += size;
++{   int tos=isTcpHit(http-log_type) ? 0 : 8; 
   
++  setsockopt(fd,SOL_IP,IP_TOS,tos,4);
 
++}
+   comm_write(fd, buf, size, clientWriteBodyComplete, http, NULL);
+   /* NULL because clientWriteBodyComplete frees it */
+   return;
+diff -urN squid-2.6.STABLE5.orig/src/defines.h squid-2.6.STABLE5/src/defines.h
+--- squid-2.6.STABLE5.orig/src/defines.h   2006-08-19 14:40:31.0 
+0200
 squid-2.6.STABLE5/src/defines.h2006-11-13 21:15:47.563667677 +0100
 @@ -41,6 +41,8 @@
  #define FALSE 0
  #endif
  
 +#define SQUID_TCP_RCVBUF SQUID_TCP_SO_RCVBUF
 +
- #define ACL_NAME_SZ 32
- #define BROWSERNAMELEN 128
+ /* Define load weights for cache_dir types */
+ #define MAX_LOAD_VALUE 1000
  
-diff -ur squid-2.5.STABLE11.orig/src/ftp.c squid-2.5.STABLE11/src/ftp.c
 squid-2.5.STABLE11.orig/src/ftp.c  2005-09-11 03:49:53.0 +0200
-+++ squid-2.5.STABLE11/src/ftp.c   2005-09-26 13:41:06.756746400 +0200
-@@ -1151,8 +1151,8 @@
- ftpState-ctrl.freefunc = memFree4K;
- ftpState-ctrl.size = 4096;
+diff -urN squid-2.6.STABLE5.orig/src/ftp.c squid-2.6.STABLE5/src/ftp.c
+--- squid-2.6.STABLE5.orig/src/ftp.c   2006-09-19 01:03:36.0 +0200
 squid-2.6.STABLE5/src/ftp.c2006-11-13 21:16:59.616675539 +0100
+@@ -1152,7 +1152,7 @@
+ ftpState-ctrl.last_command = xstrdup(Connect to server);
+ ftpState-ctrl.buf = memAllocBuf(4096, ftpState-ctrl.size);
  ftpState-ctrl.offset = 0;
--ftpState-data.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
--ftpState-data.size = SQUID_TCP_SO_RCVBUF;
-+ftpState-data.buf = xmalloc(SQUID_TCP_RCVBUF  SQUID_TCP_SO_RCVBUF ? 
SQUID_TCP_RCVBUF : SQUID_TCP_SO_RCVBUF);
-+ftpState-data.size = (SQUID_TCP_RCVBUF  SQUID_TCP_SO_RCVBUF ? 
SQUID_TCP_RCVBUF : SQUID_TCP_SO_RCVBUF);
- ftpState-data.freefunc = xfree;
+-ftpState-data.buf = memAllocBuf(SQUID_TCP_SO_RCVBUF, 
ftpState-data.size);
++ftpState-data.buf = memAllocBuf(SQUID_TCP_RCVBUF  SQUID_TCP_SO_RCVBUF ? 
SQUID_TCP_RCVBUF : SQUID_TCP_SO_RCVBUF, ftpState-data.size);
  ftpScheduleReadControlReply(ftpState, 0);
  }
-diff -ur squid-2.5.STABLE11.orig/src/http.c squid-2.5.STABLE11/src/http.c
 squid-2.5.STABLE11.orig/src/http.c 2005-09-11 03:49:54.0 +0200
-+++ 

SPECS: squid.spec - updated squid_hit_miss_mark.patch (i hope :), ...

2006-11-13 Thread dzeus
Author: dzeusDate: Mon Nov 13 20:28:03 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated squid_hit_miss_mark.patch (i hope :), not tested

 Files affected:
SPECS:
   squid.spec (1.254 - 1.255) 

 Diffs:


Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.254 SPECS/squid.spec:1.255
--- SPECS/squid.spec:1.254  Sun Nov 12 14:00:43 2006
+++ SPECS/squid.specMon Nov 13 21:27:57 2006
@@ -15,7 +15,7 @@
 Summary(zh_CN):SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:  squid
 Version:   2.6.STABLE5
-Release:   0.3
+Release:   0.4
 Epoch: 7
 License:   GPL v2
 Group: Networking/Daemons
@@ -35,7 +35,9 @@
 # Bug fixes from Squid home page, please include URL
 # lets have fun - there is no patches... yet :)
 # Other patches:
-Patch100:  http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
+#Patch100: http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
+# http://lists.debian.org/debian-user-polish/2006/07/msg00213.html
+Patch100:  %{name}_hit_miss_mark.patch
 Patch101:  %{name}-fhs.patch
 Patch102:  %{name}-location.patch
 Patch103:  %{name}-domainmatch.patch
@@ -437,7 +439,7 @@
 # Bug fixes from Squid home page:
 
 # Other patches:
-#%patch100 -p1 --needs fix
+%patch100 -p1
 %patch101 -p1
 %patch102 -p1
 #%patch103 -p1 --needs fix
@@ -758,6 +760,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.255  2006/11/13 20:27:57  dzeus
+- updated squid_hit_miss_mark.patch (i hope :), not tested
+
 Revision 1.254  2006/11/12 13:00:43  dzeus
 - updated modules list, build but not tested
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.254r2=1.255f=u

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


SOURCES: unionfs-build.patch - fix build with multiword $(CC) - UC...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:38:06 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fix build with multiword $(CC)
- UCFLAGS before objects

 Files affected:
SOURCES:
   unionfs-build.patch (1.2 - 1.3) 

 Diffs:


Index: SOURCES/unionfs-build.patch
diff -u SOURCES/unionfs-build.patch:1.2 SOURCES/unionfs-build.patch:1.3
--- SOURCES/unionfs-build.patch:1.2 Sun Jan 29 00:23:50 2006
+++ SOURCES/unionfs-build.patch Mon Nov 13 21:38:01 2006
@@ -1,16 +1,16 @@
-diff -urN unionfs-1.1.2.org/Makefile unionfs-1.1.2/Makefile
 unionfs-1.1.2.org/Makefile 2006-01-25 22:58:11.0 +0100
-+++ unionfs-1.1.2/Makefile 2006-01-29 00:23:36.229374500 +0100
-@@ -12,7 +12,7 @@
- VERSION  = 1.1.2
+diff -Nur unionfs-1.3.orig/Makefile unionfs-1.3.build/Makefile
+--- unionfs-1.3.orig/Makefile  2006-06-26 19:46:44.0 +
 unionfs-1.3.build/Makefile 2006-11-13 20:35:25.0 +
+@@ -16,7 +16,7 @@
+ SUP_EXTRA=
  TAROPTS = czvf
  COMPEXT = .gz
 -UNIONFS_DEBUG_CFLAG = -g
 +UNIONFS_DEBUG_CFLAG =
  UNIONFS_OPT_CFLAG= -O2
- UNIONFS_VERSION_CFLAG=-DUNIONFS_VERSION=\${VERSION}\
+ UNIONFS_VERSION_CFLAG=-DUNIONFS_VERSION=\${VERSION}\ 
-DSUP_MAJOR=${SUP_MAJOR} -DSUP_MINOR=${SUP_MINOR} -DSUP_PATCH=${SUP_PATCH}
  
-@@ -29,8 +29,8 @@
+@@ -33,8 +33,8 @@
  
  CC= gcc
  KERNELVERSION=$(shell echo $(KVERS) | cut -d. -f1,2)
@@ -21,3 +21,32 @@
  
  obj-m := unionfs.o
  unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \
+@@ -84,7 +84,7 @@
+ ${unionfs-objs}: unionfs.h
+ 
+ utils: FRC
+-  make -C utils all CC=${CC} UCFLAGS='-I.. ${UCFLAGS}'
++  make -C utils all CC='${CC}' UCFLAGS='-I.. ${UCFLAGS}'
+ 
+ install-utils: utils
+   make -C utils install PREFIX=${PREFIX}
+diff -Nur unionfs-1.3.orig/utils/Makefile unionfs-1.3.build/utils/Makefile
+--- unionfs-1.3.orig/utils/Makefile2006-06-26 19:46:45.0 +
 unionfs-1.3.build/utils/Makefile   2006-11-13 20:35:59.0 +
+@@ -4,13 +4,13 @@
+ all:  ${BINS}
+ 
+ unionctl: unionctl.c usercommon.c
+-  ${CC} -o $@ $^ ${UCFLAGS}
++  ${CC} ${UCFLAGS} -o $@ $^
+ 
+ uniondbg: uniondbg.c
+-  ${CC} -o $@ $^ ${UCFLAGS}
++  ${CC} ${UCFLAGS} -o $@ $^
+ 
+ unionimap: unionimap.c usercommon.c
+-  ${CC} -o $@ $^ -luuid ${UCFLAGS}
++  ${CC} ${UCFLAGS} -o $@ $^ -luuid
+ 
+ TAGS: $(wildcard *.[ch])
+   etags -t $^


 CVS-web:
http://cvs.pld-linux.org/SOURCES/unionfs-build.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


SPECS: unionfs.spec - use rpmldflags

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:38:34 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use rpmldflags

 Files affected:
SPECS:
   unionfs.spec (1.25 - 1.26) 

 Diffs:


Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.25 SPECS/unionfs.spec:1.26
--- SPECS/unionfs.spec:1.25 Mon Nov 13 21:13:08 2006
+++ SPECS/unionfs.spec  Mon Nov 13 21:38:29 2006
@@ -110,7 +110,7 @@
 %if %{with userspace}
 %{__make} utils \
CC=%{__cc} \
-   UNIONFS_OPT_CFLAG=%{rpmcflags}
+   UNIONFS_OPT_CFLAG=%{rpmcflags} %{rpmldflags}
 %endif
 
 %install
@@ -167,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.26  2006/11/13 20:38:29  sparky
+- use rpmldflags
+
 Revision 1.25  2006/11/13 20:13:08  sparky
 - up to 1.3 (for 2.6.17)
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/unionfs.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


SPECS (LINUX_2_6_16): unionfs.spec - use rpmldfalgs

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:48:05 2006 GMT
Module: SPECS Tag: LINUX_2_6_16
 Log message:
- use rpmldfalgs

 Files affected:
SPECS:
   unionfs.spec (1.24.2.1 - 1.24.2.2) 

 Diffs:


Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.24.2.1 SPECS/unionfs.spec:1.24.2.2
--- SPECS/unionfs.spec:1.24.2.1 Mon Nov 13 21:16:23 2006
+++ SPECS/unionfs.spec  Mon Nov 13 21:48:00 2006
@@ -110,7 +110,7 @@
 %if %{with userspace}
 %{__make} utils \
CC=%{__cc} \
-   UNIONFS_OPT_CFLAG=%{rpmcflags}
+   UNIONFS_OPT_CFLAG=%{rpmcflags} %{rpmldflags}
 %endif
 
 %install
@@ -167,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.24.2.2  2006/11/13 20:48:00  sparky
+- use rpmldfalgs
+
 Revision 1.24.2.1  2006/11/13 20:16:23  sparky
 - fixed
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.24.2.1r2=1.24.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


SOURCES (LINUX_2_6_16): unionfs-build.patch - rename 'install-util...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 20:48:42 2006 GMT
Module: SOURCES   Tag: LINUX_2_6_16
 Log message:
- rename 'install-utils' rule to 'install'

 Files affected:
SOURCES:
   unionfs-build.patch (1.3 - 1.3.2.1) 

 Diffs:


Index: SOURCES/unionfs-build.patch
diff -u SOURCES/unionfs-build.patch:1.3 SOURCES/unionfs-build.patch:1.3.2.1
--- SOURCES/unionfs-build.patch:1.3 Mon Nov 13 21:38:01 2006
+++ SOURCES/unionfs-build.patch Mon Nov 13 21:48:36 2006
@@ -1,6 +1,6 @@
-diff -Nur unionfs-1.3.orig/Makefile unionfs-1.3.build/Makefile
 unionfs-1.3.orig/Makefile  2006-06-26 19:46:44.0 +
-+++ unionfs-1.3.build/Makefile 2006-11-13 20:35:25.0 +
+diff -Nur unionfs-1.2.orig/Makefile unionfs-1.2.build/Makefile
+--- unionfs-1.2.orig/Makefile  2006-06-09 07:04:43.0 +
 unionfs-1.2.build/Makefile 2006-11-13 20:44:07.0 +
 @@ -16,7 +16,7 @@
  SUP_EXTRA=
  TAROPTS = czvf
@@ -30,9 +30,9 @@
  
  install-utils: utils
make -C utils install PREFIX=${PREFIX}
-diff -Nur unionfs-1.3.orig/utils/Makefile unionfs-1.3.build/utils/Makefile
 unionfs-1.3.orig/utils/Makefile2006-06-26 19:46:45.0 +
-+++ unionfs-1.3.build/utils/Makefile   2006-11-13 20:35:59.0 +
+diff -Nur unionfs-1.2.orig/utils/Makefile unionfs-1.2.build/utils/Makefile
+--- unionfs-1.2.orig/utils/Makefile2006-06-09 07:04:44.0 +
 unionfs-1.2.build/utils/Makefile   2006-11-13 20:43:53.0 +
 @@ -4,13 +4,13 @@
  all:  ${BINS}
  
@@ -50,3 +50,12 @@
  
  TAGS: $(wildcard *.[ch])
etags -t $^
+@@ -23,7 +23,7 @@
+ 
+ PHONY. utils: ${BINS}
+ 
+-install-utils: utils
++install: utils
+   mkdir -p ${PREFIX}/sbin
+   cp unionctl ${PREFIX}/sbin
+   cp uniondbg ${PREFIX}/sbin


 CVS-web:
http://cvs.pld-linux.org/SOURCES/unionfs-build.patch?r1=1.3r2=1.3.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


SVN: admin/dns/pld-linux.org.template

2006-11-13 Thread domelu
Author: domelu
Date: Mon Nov 13 21:53:09 2006
New Revision: 7980

Modified:
   admin/dns/pld-linux.org.template
Log:
- added sparcrcd


Modified: admin/dns/pld-linux.org.template
==
--- admin/dns/pld-linux.org.template(original)
+++ admin/dns/pld-linux.org.templateMon Nov 13 21:53:09 2006
@@ -1,7 +1,7 @@
 $TTL 30m
 $ORIGIN .
 pld-linux.org  IN SOA  ns1.pld-linux.org. hostmaster.pld-linux.org. (
-   2006111303 ; serial
+   2006111304 ; serial
1h ; refresh
30m; retry
7d ; expire
@@ -106,6 +106,7 @@
 *.rescuecd 1h  CNAME   rescuecd
 ppcrcd 1h  CNAME   ep09
 nightlybuild.ppcrcdCNAME   gzowski.opole.pl.
+sparcrcd   1h  CNAME   team
 poldek 1h  CNAME   ep09
 
 rsync  10m A   %RSYNC%
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


SPECS (DEVEL): kadu.spec - better snapshot handling

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 21:08:33 2006 GMT
Module: SPECS Tag: DEVEL
 Log message:
- better snapshot handling

 Files affected:
SPECS:
   kadu.spec (1.97.2.67 - 1.97.2.68) 

 Diffs:


Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.67 SPECS/kadu.spec:1.97.2.68
--- SPECS/kadu.spec:1.97.2.67   Wed Nov  1 14:18:51 2006
+++ SPECS/kadu.spec Mon Nov 13 22:08:28 2006
@@ -29,17 +29,17 @@
 %define_led_ver0.9
 %define_miasto_plusa_ver   1.3.2
 %define_tabs_ver   rev46
-%definesnapshot_major  2006
-%definesnapshot_minor  1025
+%definesnapshot20061025
+%defineyear%(echo %{snapshot} |cut -b -4)
 #
 Summary:   A Gadu-Gadu client for online messaging
 Summary(pl):   Klient Gadu-Gadu do przesyłania wiadomości po sieci
 Name:  kadu
 Version:   0.5.0
-Release:   0.%{snapshot_major}%{snapshot_minor}.3
+Release:   0.%{snapshot}.3
 License:   GPL v2
 Group: Applications/Communications
-Source0:   
http://kadu.net/download/snapshots/%{snapshot_major}/%{name}-%{snapshot_major}%{snapshot_minor}.tar.bz2
+Source0:   
http://kadu.net/download/snapshots/%{year}/%{name}-%{snapshot}.tar.bz2
 # Source0-md5: 21a55d099699d967028e49f4d8307a99
 Source1:   %{name}.desktop
 Source2:   
http://scripts.one.pl/xmms/devel/%{version}/xmms-%{_xmms_mod_ver}.tar.gz
@@ -648,6 +648,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.97.2.68  2006/11/13 21:08:28  shadzik
+- better snapshot handling
+
 Revision 1.97.2.67  2006/11/01 13:18:51  zergin
 - version 0.20061025.3
 - fix missing dirs


 CVS-web:
http://cvs.pld-linux.org/SPECS/kadu.spec?r1=1.97.2.67r2=1.97.2.68f=u

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


DISTFILES: ERRORS: xmms-1.30.tar.gz amarok-1.18.tar.gz spellchecker-0.19.tar.gz weather-3.01.tar.bz2 tcl_scripting-0.6.2-Josephine.tar.gz kadu-spy-0.0.8-2.tar.gz led_notify-0.9.tar.bz2 miastoplusa_sms

2006-11-13 Thread shadzik
kadu.spec: unexpanded macros in http://kadu.net/download/snapshots/%(echo 
20061025 |cut -b -4)/kadu-20061025.tar.bz2
kadu.spec: source 0 url http://kadu.net/download/snapshots/%(echo 20061025 |cut 
-b -4)/kadu-20061025.tar.bz2 is ill-formatted



Files fetched: 0

ALREADY GOT: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz
422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
ALREADY GOT: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.18.tar.gz
0ec8466884d98d63a6d2e4eeac814612  amarok-1.18.tar.gz
ALREADY GOT: 
http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.19.tar.gz
f1e1c572f9fd92dfb420e62818bc826c  spellchecker-0.19.tar.gz
ALREADY GOT: http://www.kadu.net/~blysk/weather-3.01.tar.bz2
c21727575d4bab551adeb9b5b1787f0c  weather-3.01.tar.bz2
ALREADY GOT: 
http://scripts.one.pl/tcl4kadu/files/stable/0.4.3/tcl_scripting-0.6.2-Josephine.tar.gz
97406c1f3f34b8a073e0a1a18e842c9e  tcl_scripting-0.6.2-Josephine.tar.gz
ALREADY GOT: http://scripts.one.pl/~przemos/download/kadu-spy-0.0.8-2.tar.gz
2ffba6058d5d463ade20ff697e200f7c  kadu-spy-0.0.8-2.tar.gz
ALREADY GOT: http://www.kadu.net/~blysk/led_notify-0.9.tar.bz2
3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
ALREADY GOT: 
http://www.kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-1.3.2.tar.gz
76233b35fa769c56d7ff1343b1bf810f  miastoplusa_sms-1.3.2.tar.gz
ALREADY GOT: http://gov.one.pl/svnsnap/tabs-svn-rev46.tar.gz
0d313a489bad8bf8b324e347e74f00e6  tabs-svn-rev46.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


SOURCES: antlr-csharp.patch (REMOVED), antlr-utils.patch (REMOVED)...

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 21:15:47 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- obsolete

 Files affected:
SOURCES:
   antlr-csharp.patch (1.1 - NONE)  (REMOVED), antlr-utils.patch (1.2 - 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


SPECS: file.spec - python epoch, package .egg-info

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 21:31:09 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- python epoch, package .egg-info

 Files affected:
SPECS:
   file.spec (1.120 - 1.121) 

 Diffs:


Index: SPECS/file.spec
diff -u SPECS/file.spec:1.120 SPECS/file.spec:1.121
--- SPECS/file.spec:1.120   Mon Nov 13 17:56:53 2006
+++ SPECS/file.spec Mon Nov 13 22:31:04 2006
@@ -52,8 +52,8 @@
 BuildRequires: automake
 BuildRequires: libtool
 %if %{with python}
-BuildRequires: python-devel = 2.5
-BuildRequires: python-modules = 2.5
+BuildRequires: python-devel = 1:2.5
+BuildRequires: python-modules = 1:2.5
 BuildRequires: rpm-pythonprov
 %endif
 Requires:  libmagic = %{version}-%{release}
@@ -356,6 +356,7 @@
 %files -n python-magic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/*.so
+%{py_sitedir}/Magic_file_extensions-*.egg-info
 %endif
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -364,6 +365,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.121  2006/11/13 21:31:04  qboosh
+- python epoch, package .egg-info
+
 Revision 1.120  2006/11/13 16:56:53  glen
 - check-files cleanup
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/file.spec?r1=1.120r2=1.121f=u

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


SPECS: gnustep-make.spec - flatten directory structure (simplifies...

2006-11-13 Thread aredridel
Author: aredridelDate: Mon Nov 13 21:32:34 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- flatten directory structure (simplifies builds, improves directory search
  performance, non-flattened is becoming ill-tested in upstream sources)

 Files affected:
SPECS:
   gnustep-make.spec (1.63 - 1.64) 

 Diffs:


Index: SPECS/gnustep-make.spec
diff -u SPECS/gnustep-make.spec:1.63 SPECS/gnustep-make.spec:1.64
--- SPECS/gnustep-make.spec:1.63Thu Mar  2 17:24:50 2006
+++ SPECS/gnustep-make.spec Mon Nov 13 22:32:29 2006
@@ -31,13 +31,6 @@
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define_prefix /usr/%{_lib}/GNUstep
-%definegsoslinux-gnu
-%ifarch %{ix86}
-%definegscpu   ix86
-%else
-# also s/alpha.*/alpha/, but we use only alpha arch for now
-%definegscpu   %(echo %{_target_cpu} | sed -e 
's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
 
 %description
 This package contains the basic tools needed to run GNUstep
@@ -77,7 +70,6 @@
 cp -f /usr/share/automake/config.* .
 %{__autoconf}
 %configure \
-   --disable-flattened \
--with-library-combo=gnu-gnu-gnu \
--with-tar=tar
 
@@ -196,9 +188,7 @@
 %{_prefix}/System/Library/Makefiles/tar-exclude-list
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.sh
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.csh
-%dir %{_prefix}/System/Library/Makefiles/%{gscpu}
-%dir %{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}
-%attr(755,root,root) 
%{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}/which_lib
+%attr(755,root,root) %{_prefix}/System/Library/Makefiles/which_lib
 
 %files devel
 %defattr(644,root,root,755)
@@ -211,7 +201,6 @@
 %{_prefix}/System/Library/Makefiles/*.template
 %{_prefix}/System/Library/Makefiles/Instance
 %{_prefix}/System/Library/Makefiles/Master
-%{_prefix}/System/Library/Makefiles/%{gscpu}/%{gsos}/*.make
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/install-sh
 %attr(755,root,root) %{_prefix}/System/Library/Makefiles/mkinstalldirs
 
@@ -221,6 +210,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.64  2006/11/13 21:32:29  aredridel
+- flatten directory structure (simplifies builds, improves directory search
+  performance, non-flattened is becoming ill-tested in upstream sources)
+
 Revision 1.63  2006/03/02 16:24:50  baggins
 - behave more
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/gnustep-make.spec?r1=1.63r2=1.64f=u

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


SPECS: gnustep-base.spec - flatten directory structure

2006-11-13 Thread aredridel
Author: aredridelDate: Mon Nov 13 21:33:06 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- flatten directory structure

 Files affected:
SPECS:
   gnustep-base.spec (1.64 - 1.65) 

 Diffs:


Index: SPECS/gnustep-base.spec
diff -u SPECS/gnustep-base.spec:1.64 SPECS/gnustep-base.spec:1.65
--- SPECS/gnustep-base.spec:1.64Tue Jan 31 00:34:57 2006
+++ SPECS/gnustep-base.spec Mon Nov 13 22:33:01 2006
@@ -37,15 +37,6 @@
 
 %define _prefix /usr/%{_lib}/GNUstep
 
-%definelibcombognu-gnu-gnu
-%definegsoslinux-gnu
-%ifarch %{ix86}
-%definegscpu   ix86
-%else
-# also s/alpha.*/alpha/, but we use only alpha arch for now
-%definegscpu   %(echo %{_target_cpu} | sed -e 
's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
-
 %description
 The GNUstep Base Library is a library of general-purpose,
 non-graphical Objective C objects. For example, it includes classes
@@ -88,7 +79,6 @@
 
 %build
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
 
 # gnustep can use one of 3 ways of getting argc,argv,env:
 # - /proc (default on Linux) - gnustep programs won't run in procless system
@@ -112,7 +102,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
 
 %{__make} install \
INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
@@ -129,7 +118,7 @@
 %endif
 
 install -d $RPM_BUILD_ROOT%{_initrddir}
-sed -e [EMAIL PROTECTED]@!%{_prefix}/System/Tools/%{gscpu}/%{gsos}! 
%{SOURCE1} \
+sed -e [EMAIL PROTECTED]@!%{_prefix}/System/Tools/! %{SOURCE1} \
 $RPM_BUILD_ROOT%{_initrddir}/gnustep
 
 install -d $RPM_BUILD_ROOT/etc/sysconfig
@@ -138,7 +127,7 @@
 echo 'GMT'  
$RPM_BUILD_ROOT%{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime
 
 install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo '%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}'  
$RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+echo '%{_prefix}/System/Library/Libraries/'  
$RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,7 +152,7 @@
 %postun -p /sbin/ldconfig
 
 %triggerpostun -- %{name}  1.11.0-1.1
-sed -i -e /^%(echo %{_prefix}/Libraries/%{gscpu}/%{gsos}/%{libcombo} | sed -e 
's,/,\\/,g')$/d /etc/ld.so.conf
+sed -i -e /^%(echo %{_prefix}/Libraries/ | sed -e 's,/,\\/,g')$/d 
/etc/ld.so.conf
 
 %files
 %defattr(644,root,root,755)
@@ -173,8 +162,8 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/sysconfig/gnustep
 
 %dir %{_prefix}/System/Library/Bundles/SSL.bundle
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/SSL.bundle/SSL
 %{_prefix}/System/Library/Bundles/SSL.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/SSL.bundle/%{gscpu}
 
 %docdir %{_prefix}/System/Library/Documentation
 %if %{with doc}
@@ -224,15 +213,12 @@
 %{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/*.plist
 %config(noreplace) %verify(not md5 mtime size) 
%{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime
 
-%attr(755,root,root) 
%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/lib*.so.*
 
-%dir %{_prefix}/System/Tools/%{gscpu}
-%dir %{_prefix}/System/Tools/%{gscpu}/%{gsos}
 # is suid necessary here??? it runs as daemon...
-#%attr(4755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/gdomap
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/gdomap
-%dir %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
+#%attr(4755,root,root) %{_prefix}/System/Tools/gdomap
+%dir %{_prefix}/System/Tools/
+%attr(755,root,root) %{_prefix}/System/Tools/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -247,12 +233,12 @@
 %{_prefix}/System/Library/Documentation/info/*.info*
 %endif
 
-%{_prefix}/System/Library/Headers/%{libcombo}/Foundation
-%{_prefix}/System/Library/Headers/%{libcombo}/GNUstepBase
-%{_prefix}/System/Library/Headers/%{libcombo}/gnustep
-%{_prefix}/System/Library/Headers/%{libcombo}/%{gscpu}/%{gsos}/*.h
+%{_prefix}/System/Library/Headers/Foundation
+%{_prefix}/System/Library/Headers/GNUstepBase
+%{_prefix}/System/Library/Headers/gnustep
+%{_prefix}/System/Library/Headers/*.h
 
-%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
+%{_prefix}/System/Library/Libraries/lib*.so
 %dir %{_prefix}/System/Library/Makefiles/Additional
 %{_prefix}/System/Library/Makefiles/Additional/base.make
 
@@ -262,6 +248,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.65  2006/11/13 21:33:01  aredridel
+- flatten directory 

SPECS: gnustep-db2.spec - CVS 20061113

2006-11-13 Thread aredridel
Author: aredridelDate: Mon Nov 13 21:37:43 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- CVS 20061113

 Files affected:
SPECS:
   gnustep-db2.spec (1.6 - 1.7) 

 Diffs:


Index: SPECS/gnustep-db2.spec
diff -u SPECS/gnustep-db2.spec:1.6 SPECS/gnustep-db2.spec:1.7
--- SPECS/gnustep-db2.spec:1.6  Sun Nov 21 01:47:20 2004
+++ SPECS/gnustep-db2.spec  Mon Nov 13 22:37:38 2006
@@ -3,12 +3,12 @@
 Summary(pl):   Druga wersja bibliotek baz danych GNUstepa
 Name:  gnustep-db2
 Version:   0
-%define cvs 20041118
+%define cvs 20061113
 Release:   0.%{cvs}.1
 License:   LGPL
 Group: Libraries
 Source0:   gdl2-cvs-%{cvs}.tar.gz
-# Source0-md5: 4cc02f28ea2d0d0a28690f344ec8a19f
+# Source0-md5: 5b4e4ec898c9390a33c3a6df5b7a5417
 URL:   http://www.gnustepweb.org/
 BuildRequires: gnustep-base-devel = 1.9.1
 BuildRequires: gnustep-make-devel = 1.9.1
@@ -19,15 +19,6 @@
 
 %define_gsdir  /usr/%{_lib}/GNUstep
 
-%definelibcombognu-gnu-gnu
-%definegsoslinux-gnu
-%ifarch %{ix86}
-%definegscpu   ix86
-%else
-# also s/alpha.*/alpha/, but we use only alpha arch for now
-%definegscpu   %(echo %{_target_cpu} | sed -e 
's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
-
 %description
 The GNUstep Database Library 2 (GDL2) is a set of libraries to map
 Objective-C objects to rows of relational database management systems
@@ -110,18 +101,17 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/libgnustep-db2*.so.*
-%attr(755,root,root) %{_gsdir}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/eoutil
-%attr(755,root,root) 
%{_gsdir}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/gdlgsdoc
+%attr(755,root,root) %{_gsdir}/System/Library/Libraries/libgnustep-db2*.so.*
+%attr(755,root,root) %{_gsdir}/System/Tools/eoutil
+%attr(755,root,root) %{_gsdir}/System/Tools/gdlgsdoc
 
 %files devel
 %defattr(644,root,root,755)
 
-%{_gsdir}/System/Library/Headers/%{libcombo}/EOAccess
-%{_gsdir}/System/Library/Headers/%{libcombo}/EOControl
-%{_gsdir}/System/Library/Headers/%{libcombo}/EOModeler
+%{_gsdir}/System/Library/Headers/EOAccess
+%{_gsdir}/System/Library/Headers/EOControl
 
-%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/libgnustep-db2*.so
+%attr(755,root,root) %{_gsdir}/System/Library/Libraries/libgnustep-db2*.so
 
 %{_gsdir}/System/Library/Makefiles/Auxiliary/gdl2.make
 
@@ -135,18 +125,14 @@
 %dir 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A
 %dir 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources
 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/*.plist
-%dir 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle
-%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/Resources
-%attr(755,root,root) 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Resources/LoginPanel.bundle/%{gscpu}
-%attr(755,root,root) 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/%{gscpu}
 
-%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/libPostgres95EOAdaptor.so.*
+%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/libPostgres95EOAdaptor.so.*
 
 %files postgresql-devel
 %defattr(644,root,root,755)
 
%{_gsdir}/System/Library/Frameworks/Postgres95EOAdaptor.framework/Versions/A/Headers
-%{_gsdir}/System/Library/Headers/%{libcombo}/Postgres95EOAdaptor
-%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/libPostgres95EOAdaptor.so
+%{_gsdir}/System/Library/Headers/Postgres95EOAdaptor
+%attr(755,root,root) 
%{_gsdir}/System/Library/Libraries/libPostgres95EOAdaptor.so
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
 %changelog
@@ -154,6 +140,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 21:37:38  aredridel
+- CVS 20061113
+
 Revision 1.6  2004/11/21 00:47:20  aredridel
 - maybe I should code when drunk? gnustep, not gnome
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/gnustep-db2.spec?r1=1.6r2=1.7f=u

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


DISTFILES: gdl2-cvs-20061113.tar.gz

2006-11-13 Thread aredridel

Files fetched: 1

STORED: no-url://gdl2-cvs-20061113.tar.gz
5b4e4ec898c9390a33c3a6df5b7a5417  gdl2-cvs-20061113.tar.gz
Size: 563533 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


SPECS: antlr.spec - use rpmcxxflags in make (configure overrides C...

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 21:43:08 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- use rpmcxxflags in make (configure overrides CXXFLAGS)

 Files affected:
SPECS:
   antlr.spec (1.44 - 1.45) 

 Diffs:


Index: SPECS/antlr.spec
diff -u SPECS/antlr.spec:1.44 SPECS/antlr.spec:1.45
--- SPECS/antlr.spec:1.44   Fri Nov 10 19:11:15 2006
+++ SPECS/antlr.specMon Nov 13 22:43:03 2006
@@ -107,6 +107,7 @@
%{!?with_gcj:CLASSPATH=`pwd` --with-java=java --with-javac=javac 
--with-jar=jar} \
%{?with_gcj:--with-java=gij --with-javac=gcj --with-jar=fastjar}
 
+CXXFLAGS=%{rpmcxxflags} \
 %{__make}
 
 %install
@@ -166,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.45  2006/11/13 21:43:03  qboosh
+- use rpmcxxflags in make (configure overrides CXXFLAGS)
+
 Revision 1.44  2006/11/10 18:11:15  prism
 - updated to 2.7.7, patches are obsolete
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/antlr.spec?r1=1.44r2=1.45f=u

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


SOURCES: antlr-DESTDIR.patch - removed junk

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 21:44:13 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- removed junk

 Files affected:
SOURCES:
   antlr-DESTDIR.patch (1.4 - 1.5) 

 Diffs:


Index: SOURCES/antlr-DESTDIR.patch
diff -u SOURCES/antlr-DESTDIR.patch:1.4 SOURCES/antlr-DESTDIR.patch:1.5
--- SOURCES/antlr-DESTDIR.patch:1.4 Fri Nov 10 19:10:35 2006
+++ SOURCES/antlr-DESTDIR.patch Mon Nov 13 22:44:08 2006
@@ -110,163 +110,6 @@
fi ;\
done
  
-diff -uNr antlr-2.7.7.orig/lib/csharp/antlr.runtime/Makefile.in~ 
antlr-2.7.7/lib/csharp/antlr.runtime/Makefile.in~
 antlr-2.7.7.orig/lib/csharp/antlr.runtime/Makefile.in~ 1970-01-01 
01:00:00.0 +0100
-+++ antlr-2.7.7/lib/csharp/antlr.runtime/Makefile.in~  2006-11-01 
22:37:17.0 +0100
-@@ -0,0 +1,153 @@
-+##xx
[EMAIL PROTECTED]@
-+##xx
-+
-+## do not change this value 
-+subdir=lib/csharp/antlr.runtime
-+
-+all :: lib
-+
-+lib: @ANTLR_NET@
-+
-+antlr_cs_FILES = \
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ANTLRException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ANTLRPanicException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ASTFactory.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ASTNodeCreator.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ASTNULLType.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ASTPair.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ASTVisitor.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/BaseAST.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ByteBuffer.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CharBuffer.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CharQueue.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CharScanner.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CharStreamException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CharStreamIOException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CommonAST.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CommonASTWithHiddenTokens.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CommonHiddenStreamToken.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/CommonToken.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/DefaultFileLineFormatter.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/DumpASTVisitor.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/FileLineFormatter.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/IHiddenStreamToken.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/InputBuffer.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/IToken.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/LexerSharedInputState.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/LLkParser.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/MismatchedCharException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/MismatchedTokenException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/NoViableAltException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/NoViableAltForCharException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/Parser.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ParserSharedInputState.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ParseTree.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ParseTreeRule.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/ParseTreeToken.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/RecognitionException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/SemanticException.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/StringUtils.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenBuffer.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/Token.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenCreator.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenQueue.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamBasicFilter.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStream.cs\
-+  @abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamHiddenTokenFilter.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamIOException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamRecognitionException.cs\
-+  
@abs_top_srcdir@/lib/csharp/antlr.runtime/antlr/TokenStreamRetryException.cs\
-+  

SPECS: qdvdauthor.spec - 0.1.4

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 21:52:23 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- 0.1.4

 Files affected:
SPECS:
   qdvdauthor.spec (1.9 - 1.10) 

 Diffs:


Index: SPECS/qdvdauthor.spec
diff -u SPECS/qdvdauthor.spec:1.9 SPECS/qdvdauthor.spec:1.10
--- SPECS/qdvdauthor.spec:1.9   Mon Oct  9 00:23:29 2006
+++ SPECS/qdvdauthor.spec   Mon Nov 13 22:52:18 2006
@@ -2,12 +2,12 @@
 Summary:   QDVDAuthor, the GUI frontend for dvdauthor and other related 
tools
 Summary(pl):   QDVDAuthor - graficzny interfejs do programu dvdauthor i 
powiązanych narzędzi
 Name:  qdvdauthor
-Version:   0.1.3
+Version:   0.1.4
 Release:   1
 License:   GPL v2
 Group: Applications/Multimedia
 Source0:   http://dl.sourceforge.net/qdvdauthor/%{name}-%{version}.tar.gz
-# Source0-md5: 3785f3770dca7cc04287c41f4ff61e51
+# Source0-md5: 7f81f2f915a1a5709a584b839a750110
 URL:   http://qdvdauthor.sourceforge.net/
 BuildRequires: qmake
 BuildRequires: qt-devel
@@ -79,6 +79,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.10  2006/11/13 21:52:18  shadzik
+- 0.1.4
+
 Revision 1.9  2006/10/08 22:23:29  shadzik
 - 0.1.3
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/qdvdauthor.spec?r1=1.9r2=1.10f=u

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


DISTFILES: qdvdauthor-0.1.4.tar.gz

2006-11-13 Thread shadzik

Files fetched: 1

STORED: http://dl.sourceforge.net/qdvdauthor/qdvdauthor-0.1.4.tar.gz
7f81f2f915a1a5709a584b839a750110  qdvdauthor-0.1.4.tar.gz
Size: 3405853 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


SPECS: cankiri.spec - pl

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 21:54:44 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- pl

 Files affected:
SPECS:
   cankiri.spec (1.3 - 1.4) 

 Diffs:


Index: SPECS/cankiri.spec
diff -u SPECS/cankiri.spec:1.3 SPECS/cankiri.spec:1.4
--- SPECS/cankiri.spec:1.3  Wed Nov  8 12:42:55 2006
+++ SPECS/cankiri.spec  Mon Nov 13 22:54:39 2006
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 Summary:   A single file screen recorder for Linux
+Summary(pl):   Jednoplikowa nagrywarka ekranu dla Linuksa
 Name:  cankiri
 Version:   0.2
 Release:   1
@@ -19,7 +20,12 @@
 
 %description
 Cankiri is a single file screen recorder for Linux and other
-systems that run GStreamer 0.10 and PyGTK 2.8
+systems that run GStreamer 0.10 and PyGTK 2.8.
+
+%description -l pl
+Cankiri to składająca się z jednego pliku nagrywarka ekranu dla
+Linuksa i innych systemów, na których działa GStreamer 0.10 i PyGTK
+2.8.
 
 %prep
 %setup -q
@@ -36,7 +42,6 @@
 %files
 %defattr(644,root,root,755)
 %doc NEWS README
-
 %attr(755,root,root) %{_bindir}/cankiri.py
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -45,6 +50,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 21:54:39  qboosh
+- pl
+
 Revision 1.3  2006/11/08 11:42:55  patrys
 - req gst = 0.10
 
@@ -53,4 +61,3 @@
 
 Revision 1.1  2006/11/05 19:25:39  patrys
 - initial PLD release
-


 CVS-web:
http://cvs.pld-linux.org/SPECS/cankiri.spec?r1=1.3r2=1.4f=u

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


DISTFILES: shishi-0.0.30.tar.gz

2006-11-13 Thread qboosh

Files fetched: 1

STORED: http://josefsson.org/shishi/releases/shishi-0.0.30.tar.gz
aa89eea3400f2de5cab07f929048f16e  shishi-0.0.30.tar.gz
Size: 3470708 bytes


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


DISTFILES: ERRORS: gsantlr-cvs-20061113.tar.gz

2006-11-13 Thread aredridel
FATAL: ./upload/aredridel/gsantlr-cvs-20061113.tar.gz md5 mismatch, needed 
486669ee86622c1c0152fa2f9d56c25c, got fce3d9251526747f0a8aa4fdd8fc2c3e

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


DISTFILES: xorg-server-1.1.99.902.tar.bz2 MesaLib-6.5.1.tar.bz2

2006-11-13 Thread arekm

Files fetched: 1

STORED: 
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.1.99.902.tar.bz2
0319aac0baee367529d0605c380281f0  xorg-server-1.1.99.902.tar.bz2
Size: 6074549 bytes
ALREADY GOT: http://dl.sourceforge.net/mesa3d/MesaLib-6.5.1.tar.bz2
c46f2c6646a270911b791dd8e1c2d977  MesaLib-6.5.1.tar.bz2


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


SPECS: dnstop.spec - pl

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 22:05:04 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- pl

 Files affected:
SPECS:
   dnstop.spec (1.1 - 1.2) 

 Diffs:


Index: SPECS/dnstop.spec
diff -u SPECS/dnstop.spec:1.1 SPECS/dnstop.spec:1.2
--- SPECS/dnstop.spec:1.1   Mon Nov  6 13:44:19 2006
+++ SPECS/dnstop.spec   Mon Nov 13 23:04:59 2006
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
-Summary:   displays various tables of DNS traffic on your network
+Summary:   Display various tables of DNS traffic on your network
+Summary(pl):   Wyświetlanie różnych zestawień ruchu DNS w sieci
 Name:  dnstop
 Version:   20060517
 Release:   1
@@ -18,6 +19,12 @@
 destination IP addresses, query types, top level domains and second
 level domains.
 
+%description -l pl
+dnstop to aplikacja oparta na libpcap (podobnie jak tcpdump)
+wyświetlająca zestawienia ruchu DNS w sieci wraz z tabelami źródłowych
+i docelowych adresów IP, rodzajów zapytań, domen głównych i drugiego
+poziomu.
+
 %prep
 %setup -q 
 
@@ -48,6 +55,8 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/13 22:04:59  qboosh
+- pl
+
 Revision 1.1  2006/11/06 12:44:19  blues
 - initial, nice dns quick-stats
-


 CVS-web:
http://cvs.pld-linux.org/SPECS/dnstop.spec?r1=1.1r2=1.2f=u

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


SPECS: ndas.spec (NEW) - NEW, I don't know what it is and I don't ...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 22:12:42 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- NEW, I don't know what it is and I don't care

 Files affected:
SPECS:
   ndas.spec (NONE - 1.1)  (NEW)

 Diffs:


Index: SPECS/ndas.spec
diff -u /dev/null SPECS/ndas.spec:1.1
--- /dev/null   Mon Nov 13 23:12:42 2006
+++ SPECS/ndas.spec Mon Nov 13 23:12:37 2006
@@ -0,0 +1,159 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without dist_kernel # allow non-distribution kernel
+%bcond_without kernel  # don't build kernel modules
+%bcond_without smp # don't build SMP module
+%bcond_without userspace   # don't build userspace programs
+%bcond_withverbose # verbose build (V=1)
+
+%if %{without kernel}
+%undefine  with_dist_kernel
+%endif
+
+%define_rel0.1
+Summary:   -
+Summary(pl):   -
+Name:  ndas
+Version:   1.0.3
+%define _subver 101
+Release:   %{_rel}
+License:   GPL/BSD/other (!!)
+Group: Base/Kernel
+Source0:   
http://code.ximeta.com/download/%{version}/%{_subver}/linux/%{name}-%{version}-%{_subver}.tar.gz
+# Source0-md5: 2e25c00fbc65af5f14d4e44d85f282f6
+Patch0:%{name}-Makefile.patch
+URL:   http://www.ximeta.com/
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 
3:2.6.14}
+BuildRequires: rpmbuild(macros) = 1.326
+%endif
+#BuildRequires:-
+#Requires(postun): -
+#Requires(pre,post):   -
+#Requires(preun):  -
+#Requires: -
+#Provides: -
+#Obsoletes:-
+#Conflicts:-
+ExclusiveArch: %{ix86}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+
+%description -l pl
+
+# kernel subpackages.
+
+%package -n kernel%{_alt_kernel}-block-ndas
+Summary:   Linux driver for NDAS
+Summary(pl):   Sterownik dla Linuksa do NDAS
+Release:   [EMAIL PROTECTED]
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):  %releq_kernel_up
+%endif
+
+%description -n kernel%{_alt_kernel}-block-ndas
+This is driver for NDAS for Linux.
+
+This package contains Linux module.
+
+%description -n kernel%{_alt_kernel}-block-ndas -l pl
+Sterownik dla Linuksa do NDAS.
+
+Ten pakiet zawiera moduł jądra Linuksa.
+
+%package -n kernel%{_alt_kernel}-smp-block-ndas
+Summary:   Linux SMP driver for NDAS
+Summary(pl):   Sterownik dla Linuksa SMP do NDAS
+Release:   [EMAIL PROTECTED]
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):  %releq_kernel_smp
+%endif
+
+%description -n kernel%{_alt_kernel}-smp-block-ndas
+This is driver for NDAS for Linux.
+
+This package contains Linux SMP module.
+
+%description -n kernel%{_alt_kernel}-smp-block-ndas -l pl
+Sterownik dla Linuksa do NDAS.
+
+Ten pakiet zawiera moduł jądra Linuksa SMP.
+
+%prep
+%setup -q -n %{name}-%{version}-%{_subver}
+%patch0 -p1
+
+%build
+%if %{with userspace}
+%{__make} ndas-admin \
+   ndas-um-cc=%{__cc} \
+   ndas-addon-extra-cflags=%{rpmcflags} \
+   ndas-app-ldflags=%{rpmldflags}
+%endif
+
+%if %{with kernel}
+%build_kernel_modules -m ndas_sal,ndas_core,ndas_block,ndas_emu
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT%{_sbindir}
+install ndasadmin $RPM_BUILD_ROOT%{_sbindir}/ndasadmin
+%endif
+
+%if %{with kernel}
+%install_kernel_modules -m ndas_sal,ndas_core,ndas_block,ndas_emu -d 
kernel/drivers/block
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -n kernel%{_alt_kernel}-block-ndas
+%depmod %{_kernel_ver}
+
+%postun-n kernel%{_alt_kernel}-block-ndas
+%depmod %{_kernel_ver}
+
+%post  -n kernel%{_alt_kernel}-smp-block-ndas
+%depmod %{_kernel_ver}smp
+
+%postun-n kernel%{_alt_kernel}-smp-block-ndas
+%depmod %{_kernel_ver}smp
+
+%if %{with userspace}
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/ndasadmin
+%endif
+
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-block-ndas
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/kernel/drivers/block/*.ko*
+
+%if %{with smp}  %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-block-ndas
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/block/*.ko*
+%endif
+%endif
+
+%define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team [EMAIL PROTECTED]
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1  2006/11/13 22:12:37  sparky
+- NEW, I don't know what it is and I don't care
+

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org

SPECS: eddie.spec - pl

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 22:14:09 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- pl

 Files affected:
SPECS:
   eddie.spec (1.1 - 1.2) 

 Diffs:


Index: SPECS/eddie.spec
diff -u SPECS/eddie.spec:1.1 SPECS/eddie.spec:1.2
--- SPECS/eddie.spec:1.1Thu Nov  9 10:22:00 2006
+++ SPECS/eddie.specMon Nov 13 23:14:03 2006
@@ -3,6 +3,7 @@
 # - finish install
 # - init.d script
 Summary:   A system monitoring, security and performance analysis agent
+Summary(pl):   Agent monitorowania systemu oraz analizy bezpieczeństwa i 
wydajności
 Name:  eddie
 Version:   0.35
 Release:   0.1
@@ -34,21 +35,37 @@
 or as complex as needed. Advanced alert control functionality such as
 exponential back-off and dependencies are also standard.
 
+%description -l pl
+EDDIE Tool może wykonywać wszystkie podstawowe testy monitorujące
+system, w tym: systemu plików, procesów, obciążenia systemu,
+konfiguracji sieci. Może także wykonywać zadania związane z
+monitorowaniem sieci, takie jak: sprawdzanie pinga, sprawdzanie HTTP,
+testy POP3, zapytania SMTP, testy uwierzytelnienia RADIUS i własne
+sposoby sprawdzania portów TCP. Ponadto niektóre testy rozciągają się
+na monitorowanie bezpieczeństwa: obserwowanie plików pod kątem zmian i
+skanowanie plików logów.
+
+EDDIE Tool może także wysyłać dowolne zbiorcze statystyki do plików
+RRD w celu graficznego wyświetlenia przez dowolne standardowe
+narzędzie RRD. Nie ma potrzeby uruchamiania wielu agentów do
+monitorowania i zbierania danych.
+
+Reguły monitorowania to zwykłe pythonowe wyrażenia, mogą być proste
+lub złożone w zależności od potrzeb. Dostępna jest także zaawansowana
+funkcjonalność kontroli alarmów, taka jak wykładnicze wycofywanie czy
+zależności.
+
 %prep
 %setup -q
 
-%build
-
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d 
$RPM_BUILD_ROOT{%{_bindir},%{py_sitescriptdir}/%{name},%{_sysconfdir}/%{name}}
 
 install bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -a lib/Linux lib/common $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}
 cp -a config.sample/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-
 %py_postclean
 
 %clean
@@ -70,7 +87,8 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/13 22:14:03  qboosh
+- pl
+
 Revision 1.1  2006/11/09 09:22:00  arekm
 - new; unfinished
-
-


 CVS-web:
http://cvs.pld-linux.org/SPECS/eddie.spec?r1=1.1r2=1.2f=u

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


SOURCES: ndas-Makefile.patch (NEW) -- some Makefile fixes: - defin...

2006-11-13 Thread sparky
Author: sparky   Date: Mon Nov 13 22:14:41 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
-- some Makefile fixes:
- define proper ndas_root when building modules
- don't call license script
- don't do anything weird with ldflags

 Files affected:
SOURCES:
   ndas-Makefile.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/ndas-Makefile.patch
diff -u /dev/null SOURCES/ndas-Makefile.patch:1.1
--- /dev/null   Mon Nov 13 23:14:41 2006
+++ SOURCES/ndas-Makefile.patch Mon Nov 13 23:14:36 2006
@@ -0,0 +1,38 @@
+diff -Nur ndas-1.0.3-101.orig/Makefile ndas-1.0.3-101.Makefile/Makefile
+--- ndas-1.0.3-101.orig/Makefile   2006-08-24 00:01:35.0 +
 ndas-1.0.3-101.Makefile/Makefile   2006-11-13 22:10:20.0 +
+@@ -28,7 +28,11 @@
+ # and fitness for purpose.
+ #-
+ # The top most directory of ndas driver
++ifdef M
++ndas_root := $(M)
++else
+ ndas_root?=$(shell pwd)
++endif
+ 
+ #
+ # Set the ndas version and ndas build
+@@ -180,12 +184,7 @@
+ 
+ ndas_cmd_app_cpp=$(ndas-um-cpp) $(ndas-app-cflags) -c -o $@ $
+ 
+-ndas-app-ldflags:=$(shell echo $(ndas-app-ldflags) | sed -e 's|^ *||')
+-ifeq ($(ndas-app-ldflags),)
+-ndas_cmd_app_ld=$(ndas-um-cc) $(ndas-app-cflags) -o $@ $^ 
+-else
+-ndas_cmd_app_ld=$(ndas-um-cc) $(ndas-app-cflags) -Wl,$(ndas-app-ldflags) -o 
$@ $^ 
+-endif
++ndas_cmd_app_ld=$(ndas-um-cc) $(ndas-app-cflags) $(ndas-app-ldflags) -o $@ $^
+ 
+ #
+ # Linux Module Source
+@@ -201,7 +200,7 @@
+ 
+ ifeq ($(wildcard $(ndas_root)/libndas.a.sfx),$(ndas_root)/libndas.a.sfx)
+ $(ndas_root)/libndas.a: $(ndas_root)/libndas.a.sfx
+-  cd $(ndas_root) ; /bin/sh $
++  tail -n +119 $  $@
+ endif
+ #
+ # Build NDAS admin tool

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


SPECS (DEVEL): nano.spec - up to 2.0.0 pionted by kaneda kaneda a...

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 22:15:07 2006 GMT
Module: SPECS Tag: DEVEL
 Log message:
- up to 2.0.0 pionted by kaneda kaneda at bohater dot net
- ready to merge

 Files affected:
SPECS:
   nano.spec (1.78.2.4 - 1.78.2.5) 

 Diffs:


Index: SPECS/nano.spec
diff -u SPECS/nano.spec:1.78.2.4 SPECS/nano.spec:1.78.2.5
--- SPECS/nano.spec:1.78.2.4Tue Nov  7 14:40:40 2006
+++ SPECS/nano.spec Mon Nov 13 23:15:01 2006
@@ -1,14 +1,13 @@
 # $Revision$, $Date$
-%define _pre   pre3
 Summary:   nano - Nano's ANOther editor, an enhanced free Pico clone
 Summary(pl):   nano - jeszcze jeden edytor, darmowy, rozbudowany klon Pico
 Name:  nano
-Version:   1.9.99
-Release:   0.%{_pre}.1
+Version:   2.0.0
+Release:   0.1
 License:   GPL v2
 Group: Applications/Editors
-Source0:   
http://www.nano-editor.org/dist/v1.3/%{name}-%{version}%{_pre}.tar.gz
-# Source0-md5: 66029c65d23f7e8f721412b1dd28744c
+Source0:   http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+# Source0-md5: d1a8ac92b1985217f405a4c54562d8f3
 Source1:   %{name}.desktop
 Source2:   %{name}.png
 Patch0:%{name}-info.patch
@@ -37,7 +36,7 @@
 lub idź do wiersza numer.
 
 %prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
 %patch0 -p1
 %patch1 -p2
 
@@ -89,6 +88,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.78.2.5  2006/11/13 22:15:01  shadzik
+- up to 2.0.0 pionted by kaneda kaneda at bohater dot net
+- ready to merge
+
 Revision 1.78.2.4  2006/11/07 13:40:40  ankry
 - pl fix; does pl translation need the same...?
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/nano.spec?r1=1.78.2.4r2=1.78.2.5f=u

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


SPECS: exaile.spec - pl, cleanup; needs FHS fix

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 22:26:48 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- pl, cleanup; needs FHS fix

 Files affected:
SPECS:
   exaile.spec (1.4 - 1.5) 

 Diffs:


Index: SPECS/exaile.spec
diff -u SPECS/exaile.spec:1.4 SPECS/exaile.spec:1.5
--- SPECS/exaile.spec:1.4   Sun Nov 12 19:42:14 2006
+++ SPECS/exaile.spec   Mon Nov 13 23:26:42 2006
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
-Summary:   A powerful GTK2 media player
+Summary:   A powerful GTK+2 media player
+Summary(pl):   Potężny odtwarzacz multimediów oparty na GTK+2
 Name:  exaile
 Version:   0.2.5
 Release:   1
+License:   GPL
+Group: X11/Applications/Multimedia
 Source0:   http://www.exaile.org/files/%{name}_%{version}.tar.gz
 # Source0-md5: f700d561e3cf756bcdcf4c006b132d51
 Patch0:%{name}-python-2.5.patch
-License:   GPL
-Group: Applications/X11
 URL:   http://www.exaile.org/
+BuildRequires: FHS-fix
 BuildRequires: python-pygtk-devel = 2.8
 Requires:  python-dbus = 0.71
 Requires:  gstreamer-plugins-base = 0.10
@@ -17,7 +19,7 @@
 
 %description
 Exaile is a media player aiming to be similar to KDE's AmaroK, but for
-gtk2. It incorporates many of the cool things from AmaroK (and other
+GTK+2. It incorporates many of the cool things from AmaroK (and other
 media players).
 
 Some of the features are:
@@ -26,27 +28,44 @@
 - lyrics fetching
 - artist/album information via the wikipedia
 - last.fm support
-- optional iPod support (assuming you have python-gpod installed).
+- optional iPod support (assuming you have python-gpod installed)
 - builtin shoutcast directory browser
 - tabbed playlists
 - blacklisting of tracks
 - downloading of guitar tabs from fretplay.com
 - submitting played tracks on the iPod to last.fm
 
+%description -l pl
+Exaile to odtwarzacz multimediów mający być podobny do AmaroKa, ale
+dla GTK+2. Łączy wiele dobrych cech AmaroKa (i innych odtwarzaczy
+multimediów).
+
+Niektóre możliwości to:
+- automatyczne pobieranie okładki albumu
+- obsługa dużych bibliotek
+- pobieranie tekstów utworów
+- informacje o wykonawcy/albumie z wikipedii
+- obsługa last.fm
+- opcjonalna obsługa iPoda (przy zainstalowanym pakiecie python-gpod)
+- wbudowana przeglądarka katalogów shoutcastów
+- playlisty z zakładkami
+- czarna lista ścieżek
+- ściąganie tabulatur gitarowych z fretplay.com
+- przesyłanie ścieżek odtworzonych na iPodzie do last.fm
+
 %prep
 %setup -q -n %{name}_%{version}
 %patch0 -p1
 
+%build
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_menudir}
 
-%{__make}
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
-%postun
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,12 +76,13 @@
 %dir %{_datadir}/%{name}
 %attr(755,root,root) %{_datadir}/%{name}/exaile.py
 %{_datadir}/%{name}/exaile.glade
-%{_datadir}/%{name}/mmkeys.so
+# FIXME: move ELF to %{_libdir}
+%attr(755,root,root) %{_datadir}/%{name}/mmkeys.so
 %{_datadir}/%{name}/images
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/sql
 %{_datadir}/%{name}/xl
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 
 %define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -71,6 +91,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 22:26:42  qboosh
+- pl, cleanup; needs FHS fix
+
 Revision 1.4  2006/11/12 18:42:14  patrys
 - make it work
 
@@ -82,4 +105,3 @@
 
 Revision 1.1  2006/11/09 20:38:31  aredridel
 - added, NFY
-


 CVS-web:
http://cvs.pld-linux.org/SPECS/exaile.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


SPECS: nano.spec - 1.3.11

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 22:37:06 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- 1.3.11

 Files affected:
SPECS:
   nano.spec (1.78 - 1.79) 

 Diffs:


Index: SPECS/nano.spec
diff -u SPECS/nano.spec:1.78 SPECS/nano.spec:1.79
--- SPECS/nano.spec:1.78Sun Jun 12 16:20:10 2005
+++ SPECS/nano.spec Mon Nov 13 23:37:00 2006
@@ -2,12 +2,12 @@
 Summary:   nano (Nano's ANOther editor)
 Summary(pl):   nano - jeszcze jeden edytor
 Name:  nano
-Version:   1.2.5
+Version:   1.3.11
 Release:   1
 License:   GPL v2
 Group: Applications/Editors
-Source0:   http://www.nano-editor.org/dist/v1.2/%{name}-%{version}.tar.gz
-# Source0-md5: f2b3efbf1cf356d736740d531b6b22c4
+Source0:   http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
+# Source0-md5: ad6c2270fd674065ef994a58d3a8a7b7
 Source1:   %{name}.desktop
 Source2:   %{name}.png
 Patch0:%{name}-info.patch
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 %build
@@ -82,6 +82,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.79  2006/11/13 22:37:00  shadzik
+- 1.3.11
+
 Revision 1.78  2005/06/12 14:20:10  megabajt
 - up to 1.2.5
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/nano.spec?r1=1.78r2=1.79f=u

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


SOURCES: nano-ncurses-ncurses.h.patch - updated for 1.3.11

2006-11-13 Thread shadzik
Author: shadzik  Date: Mon Nov 13 22:37:24 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 1.3.11

 Files affected:
SOURCES:
   nano-ncurses-ncurses.h.patch (1.1 - 1.2) 

 Diffs:


Index: SOURCES/nano-ncurses-ncurses.h.patch
diff -u SOURCES/nano-ncurses-ncurses.h.patch:1.1 
SOURCES/nano-ncurses-ncurses.h.patch:1.2
--- SOURCES/nano-ncurses-ncurses.h.patch:1.1Sun May 11 16:49:59 2003
+++ SOURCES/nano-ncurses-ncurses.h.patchMon Nov 13 23:37:19 2006
@@ -1,22 +1,24 @@
 nano-1.2.1/nano.h~ Sun May 11 16:35:14 2003
-+++ nano-1.2.1/nano.h  Sun May 11 16:35:14 2003
-@@ -50,6 +50,8 @@
+--- nano-1.3.11/src/nano.h 2006-03-30 03:18:29.0 +0200
 nano-1.3.11/src/nano.h-new 2006-11-13 23:29:04.742696728 +0100
+@@ -71,8 +71,8 @@
  #define KEY_DC SL_KEY_DELETE
- #elif defined(HAVE_NCURSES_H)
- #include ncurses.h
+ #define KEY_IC SL_KEY_IC
+ /* Ncurses support. */
+-#elif defined(HAVE_NCURSES_H)
+-#include ncurses.h
 +#elif defined(HAVE_NCURSES_NCURSES_H)
 +#include ncurses/ncurses.h
- #else /* Uh oh */
- #include curses.h 
- #endif /* CURSES_H */
 nano-1.2.1/configure.ac~   Sun May 11 16:36:24 2003
-+++ nano-1.2.1/configure.acSun May 11 16:36:24 2003
-@@ -295,7 +295,7 @@
+ #else
+ /* Curses support. */
+ #include curses.h
+--- nano-1.3.11/configure.ac   2006-11-13 23:34:50.167184224 +0100
 nano-1.3.11/configure.ac-new   2006-11-13 23:35:02.974237256 +0100
+@@ -425,7 +425,7 @@
+ dnl Checks for libraries.
  
- if eval test x$CURSES_LIB_NAME = x
- then
--AC_CHECK_HEADERS(curses.h ncurses.h)
-+AC_CHECK_HEADERS(curses.h ncurses.h ncurses/ncurses.h)
- AC_CHECK_LIB(ncurses, tgetent, [CURSES_LIB=-lncurses 
CURSES_LIB_NAME=ncurses])
- fi
+ if eval test x$CURSES_LIB_NAME = x; then
+-AC_CHECK_HEADERS(ncurses.h)
++AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h)
  
+ if test x$enable_utf8 != xno; then
+   AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB=-lncursesw 
CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])


 CVS-web:

http://cvs.pld-linux.org/SOURCES/nano-ncurses-ncurses.h.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


SPECS: mozilla-firefox.spec - updated to 1.5.0.8 (fixes CVE-2006-5...

2006-11-13 Thread qboosh
Author: qboosh   Date: Mon Nov 13 22:39:41 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 1.5.0.8 (fixes CVE-2006-5462 CVE-2006-5463 CVE-2006-5464 
CVE-2006-5747 CVE-2006-5748)

 Files affected:
SPECS:
   mozilla-firefox.spec (1.158 - 1.159) 

 Diffs:


Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.158 SPECS/mozilla-firefox.spec:1.159
--- SPECS/mozilla-firefox.spec:1.158Tue Nov  7 23:29:01 2006
+++ SPECS/mozilla-firefox.spec  Mon Nov 13 23:39:36 2006
@@ -18,12 +18,12 @@
 Summary:   Mozilla Firefox web browser
 Summary(pl):   Mozilla Firefox - przeglądarka WWW
 Name:  mozilla-firefox
-Version:   1.5.0.7
+Version:   1.5.0.8
 Release:   1
 License:   MPL/LGPL
 Group: X11/Applications/Networking
 Source0:   
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 518cbd99a3fe663237070013e5cdb1a4
+# Source0-md5: 86f98df1586efb419225a2988a217951
 Source1:   %{name}.desktop
 Source2:   %{name}.sh
 Patch0:%{name}-nss.patch
@@ -368,6 +368,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.159  2006/11/13 22:39:36  qboosh
+- updated to 1.5.0.8 (fixes CVE-2006-5462 CVE-2006-5463 CVE-2006-5464 
CVE-2006-5747 CVE-2006-5748)
+
 Revision 1.158  2006/11/07 22:29:01  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories 
unexpectedly
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.158r2=1.159f=u

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


  1   2   >