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.52 Sun 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.13 Wed 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_with verbose # 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.8 Thu Oct 12 22:47:30 2006
+++ SPECS/VMware-player.spec Mon 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 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.8 2006/10/12 20:47:30 qboosh
- with any-any-update kernel modules can be in different version, dropped even
Conflicts
================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.20 SPECS/VMware-server.spec:1.21
--- SPECS/VMware-server.spec:1.20 Thu Oct 12 22:47:30 2006
+++ SPECS/VMware-server.spec Mon Nov 13 15:51:45 2006
@@ -360,7 +360,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
@@ -476,7 +476,7 @@
#cd vmware-any-any-update%{_urel}
cd lib/modules/source
-%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 \
@@ -721,7 +721,7 @@
%endif
%if %{with kernel}
-%if %{without kernel24}
+%if !%{with kernel24}
%files -n kernel-misc-vmmon
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -769,6 +769,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.20 2006/10/12 20:47:30 qboosh
- with any-any-update kernel modules can be in different version, dropped even
Conflicts
================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.96 SPECS/VMware-workstation.spec:1.97
--- SPECS/VMware-workstation.spec:1.96 Thu Oct 12 22:47:30 2006
+++ SPECS/VMware-workstation.spec Mon Nov 13 15:51:45 2006
@@ -22,7 +22,7 @@
%undefine with_userspace
%endif
-%if %{without kernel}
+%if !%{with kernel}
%undefine with_dist_kernel
%endif
#
@@ -316,7 +316,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
@@ -415,7 +415,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 \
@@ -617,7 +617,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*
@@ -665,6 +665,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.97 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.96 2006/10/12 20:47:30 qboosh
- with any-any-update kernel modules can be in different version, dropped even
Conflicts
================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.134 SPECS/X11-driver-firegl.spec:1.135
--- SPECS/X11-driver-firegl.spec:1.134 Mon Nov 13 13:41:56 2006
+++ SPECS/X11-driver-firegl.spec Mon Nov 13 15:51:45 2006
@@ -12,7 +12,7 @@
%define _max_x11 1:7.0.0
%define x11ver x690
-%if %{without kernel}
+%if !%{with kernel}
%undefine with_dist_kernel
%endif
@@ -241,6 +241,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.135 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.134 2006/11/13 12:41:56 sparky
- use %build_kernel_modules, %install_kernel_modules (not tested)
================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.87 SPECS/X11-driver-nvidia.spec:1.88
--- SPECS/X11-driver-nvidia.spec:1.87 Mon Nov 13 13:17:22 2006
+++ SPECS/X11-driver-nvidia.spec Mon Nov 13 15:51:45 2006
@@ -27,7 +27,7 @@
%endif
%endif
-%if %{without kernel}
+%if !%{with kernel}
%undefine with_dist_kernel
%endif
#
@@ -350,6 +350,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.88 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.87 2006/11/13 12:17:22 sparky
- use %build_kernel_modules, %install_kernel_modules (not tested)
================================================================
Index: SPECS/acroread.spec
diff -u SPECS/acroread.spec:1.67 SPECS/acroread.spec:1.68
--- SPECS/acroread.spec:1.67 Sun Oct 29 21:56:19 2006
+++ SPECS/acroread.spec Mon Nov 13 15:51:45 2006
@@ -100,7 +100,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 '
@@ -143,7 +143,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{without license_agreement}
+%if !%{with license_agreement}
%post
%{_bindir}/%{base_name}.install
@@ -188,7 +188,7 @@
%files
%defattr(644,root,root,755)
-%if %{without license_agreement}
+%if !%{with license_agreement}
%attr(755,root,root) %{_bindir}/%{base_name}.install
%{_datadir}/%{base_name}
%else
@@ -231,6 +231,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.68 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.67 2006/10/29 20:56:19 glen
- rel 4
================================================================
Index: SPECS/allegro.spec
diff -u SPECS/allegro.spec:1.63 SPECS/allegro.spec:1.64
--- SPECS/allegro.spec:1.63 Sun Apr 16 22:28:09 2006
+++ SPECS/allegro.spec Mon Nov 13 15:51:45 2006
@@ -426,7 +426,7 @@
%{?with_static:--enable-static} \
%{?with_dbglib:--enable-dbglib} \
%{?with_proflib:--enable-proflib} \
-%if %{without alsa}
+%if !%{with alsa}
--disable-alsadigi \
--disable-alsamidi \
%endif
@@ -437,7 +437,7 @@
%{!?with_jack:--disable-jackdigi} \
%{!?with_svga:--disable-svgalib} \
%{!?with_vga:--disable-vga} \
-%if %{without sse}
+%if !%{with sse}
--disable-sse \
--disable-asm \
%endif
@@ -668,6 +668,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.64 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.63 2006/04/16 20:28:09 qboosh
- added config patch to kill -L/usr/lib from `allegro-config --libs`
================================================================
Index: SPECS/atmelwlandriver.spec
diff -u SPECS/atmelwlandriver.spec:1.44 SPECS/atmelwlandriver.spec:1.45
--- SPECS/atmelwlandriver.spec:1.44 Wed Sep 6 15:48:33 2006
+++ SPECS/atmelwlandriver.spec Mon Nov 13 15:51:45 2006
@@ -8,7 +8,7 @@
%bcond_without userspace # don't build userspace applications
%bcond_with verbose # verbose build (V=1)
-%if %{without kernel}
+%if !%{with kernel}
%undefine with_dist_kernel
%endif
@@ -315,6 +315,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2006/11/13 14:51:45 sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
Revision 1.44 2006/09/06 13:48:33 sparky
- mass atack: -j1 for make scripts
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/Atari800.spec?r1=1.52&r2=1.53&f=u
http://cvs.pld-linux.org/SPECS/EMCpower.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/LTI-Lib.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/VMware-player.spec?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.96&r2=1.97&f=u
http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.134&r2=1.135&f=u
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.spec?r1=1.87&r2=1.88&f=u
http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.67&r2=1.68&f=u
http://cvs.pld-linux.org/SPECS/allegro.spec?r1=1.63&r2=1.64&f=u
http://cvs.pld-linux.org/SPECS/atmelwlandriver.spec?r1=1.44&r2=1.45&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
