Changeset 274 for branches/samba-3.3.x/packaging

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

Location:

branches/samba-3.3.x/packaging

Files:

• RHEL-CTDB/samba.spec (modified) (1 diff)
• RHEL/makerpms.sh (modified) (1 diff)
• RHEL/samba.spec (modified) (3 diffs)
• RHEL/samba.spec.tmpl (modified) (2 diffs)

branches/samba-3.3.x/packaging/RHEL-CTDB/samba.spec

@@ -6 +6 @@
 Packager: Samba Team <samba@samba.org>
 Name:         samba
-Version:      3.3.4
+Version:      3.3.5
 Release:      ctdb.1
 Epoch:        0

branches/samba-3.3.x/packaging/RHEL/makerpms.sh

@@ -21 +21 @@
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.3.4'
+VERSION='3.3.5'
 REVISION=''
 SPECFILE="samba.spec"

branches/samba-3.3.x/packaging/RHEL/samba.spec

@@ -6 +6 @@
 Packager: Samba Team <samba@samba.org>
 Name:         samba
-Version:      3.3.4
+Version:      3.3.5
 Release:      1
 Epoch:        0
@@ -29 +29 @@
 Prefix: /usr
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
 
 # Working around perl dependency problem from docs
@@ -123 +123 @@
 
 ## check for ccache
- ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
+if [ "$(which ccache 2> /dev/null)" != "" ]; then
         CC="ccache gcc"
 else

branches/samba-3.3.x/packaging/RHEL/samba.spec.tmpl

@@ -29 +29 @@
 Prefix: /usr
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
 
 # Working around perl dependency problem from docs
@@ -123 +123 @@
 
 ## check for ccache
- ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
+if [ "$(which ccache 2> /dev/null)" != "" ]; then
         CC="ccache gcc"
 else