rpms/samba/devel samba.spec,1.156,1.157

Simo Sorce (simo) fedora-extras-commits at redhat.com
Wed Aug 6 18:11:50 UTC 2008


Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29871/devel

Modified Files:
	samba.spec 
Log Message:
Workaround to get the right release version in /usr/sbin/smbd -V
The other packages Release: variables were overwriting %{release} so
that we got the wrong info in there.




Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- samba.spec	6 Aug 2008 14:55:49 -0000	1.156
+++ samba.spec	6 Aug 2008 18:11:19 -0000	1.157
@@ -3,11 +3,13 @@
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
+%define samba_release 0.%{main_release}%{?dist}
+
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
 Version: 3.2.1
-Release: 0.%{main_release}%{?dist}
+Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -252,7 +254,7 @@
 #%patch200 -p0 -b .inotify # FIXME: does not compile
 
 mv source/VERSION source/VERSION.orig
-sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
+sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
 cd source
 script/mkversion.sh
 cd ..




More information about the fedora-extras-commits mailing list