SPECS: crossfire-client.spec - new-style bcond, strict internal deps

[qboosh]

Author: qboosh                       Date: Sat Aug 27 08:34:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new-style bcond, strict internal deps

---- Files affected:
SPECS:
   crossfire-client.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/crossfire-client.spec
diff -u SPECS/crossfire-client.spec:1.35 SPECS/crossfire-client.spec:1.36
--- SPECS/crossfire-client.spec:1.35	Sun Aug 21 10:53:26 2005
+++ SPECS/crossfire-client.spec	Sat Aug 27 10:34:06 2005
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	images	# don't build images package
+#
 %define		sndver	1.4.0
 %define		imgver	1.7.1
 Summary:	Crossfire client
@@ -21,7 +25,7 @@
 BuildRequires:	autoconf
 BuildRequires:	gtk+-devel
 BuildRequires:	perl-base
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,7 +57,7 @@
 Summary:	Crossfire sounds
 Summary(pl):	Dźwięki do Crossfire
 Group:		Applications/Games
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{version}-%{release}
 
 %description sounds
 Some sound files and the sound server for crossfire.
@@ -65,7 +69,7 @@
 Summary:	GTK+ Crossfire client
 Summary(pl):	Klient Crossfire pod GTK+
 Group:		Applications/Games
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{version}-%{release}
 
 %description gtk
 GTK+ client to crossfire.
@@ -96,7 +100,7 @@
 Summary:	GTK+2 Crossfire client
 Summary(pl):	Klient Crossfire pod GTK+2
 Group:		Applications/Games
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{version}-%{release}
 
 %description gtk2
 GTK+2 client to crossfire.
@@ -123,12 +127,11 @@
 przedmiotów i walcząc z potworami. Mogą grać w kooperacji lub
 przeciwko sobie w tym samym "świecie".
 
-
 %package images
 Summary:	Crossfire images
 Summary(pl):	Obrazki do Crossfire
 Group:		Applications/Games
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{version}-%{release}
 
 %description images
 Some images extracted from server for Crossfire.
@@ -150,7 +153,7 @@
 %prep
 %setup  -q -a1
 mv -f sounds cfsounds
-%if %{?_without_images:0}%{?!_without_images:1}
+%if %{with images}
 install -d images
 cd images
 tar xzf %{SOURCE2}
@@ -172,7 +175,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 install cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/
-%if %{?_without_images:0}%{?!_without_images:1}
+%if %{with images}
 install images/bmaps.client images/crossfire.base images/crossfire.clsc \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 %endif
@@ -196,7 +199,7 @@
 %attr(755,root,root) %{_bindir}/cfsndserv*
 %{_datadir}/%{name}/sounds
 
-%if %{?_without_images:0}%{?!_without_images:1}
+%if %{with images}
 %files images
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/bmaps.client
@@ -219,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2005/08/27 08:34:06  qboosh
+- new-style bcond, strict internal deps
+
 Revision 1.35  2005/08/21 08:53:26  wiget
 - updated to 1.8.0 (images to 1.7.1)
 - added gtk2 subpackage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossfire-client.spec?r1=1.35&r2=1.36&f=u