Accepting request 83168 from home:jengelh:bl-c

- Remove redundant tags/sections from specfile
- Use %_smp_mflags for parallel build

OBS-URL: https://build.opensuse.org/request/show/83168
OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=18

cyrus-sasl-saslauthd.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Sep 18 00:16:00 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
+-------------------------------------------------------------------
+Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
+
+- use %_smp_mflags
+
 -------------------------------------------------------------------
 Mon Jun  7 06:15:02 UTC 2010 - coolo@novell.com
 

cyrus-sasl-saslauthd.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package cyrus-sasl-saslauthd (Version 2.1.23)
+# spec file for package cyrus-sasl-saslauthd
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           cyrus-sasl-saslauthd
@@ -23,12 +22,11 @@ BuildRequires:  db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel p
 License:        BSD4c(or similar)
 Group:          Productivity/Networking/Other
 Url:            http://asg.web.cmu.edu/sasl/
-AutoReqProv:    on
 Provides:       cyrus-sasl:/usr/sbin/saslauthd
 Provides:       cyrus-sasl2:/usr/sbin/saslauthd
 Summary:        The SASL Authentication Server
 Version:        2.1.23
-Release:        7
+Release:        14
 Source:         cyrus-sasl-%{version}.tar.bz2
 Source1:        cyrus-sasl-rc.tar.bz2
 Patch:          cyrus-sasl.dif
@@ -43,16 +41,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This daemon is required when using cyrus-sasl in server software that
 should authenticate with PAM, for example.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %package -n     cyrus-sasl-ldap-auxprop
 License:        BSD4c(or similar)
 Summary:        The cyrus-sasl LDAP auxprop plugin
-AutoReqProv:    on
 Group:          Productivity/Networking/Other
 Requires:       cyrus-sasl
 
@@ -60,28 +51,15 @@ Requires:       cyrus-sasl
 The LDAP auxprop plugin allows for tighter application/directory
 integration.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %package -n     cyrus-sasl-sqlauxprop
 License:        BSD4c(or similar)
 Summary:        SQL auxprop plugin for cyrus-sasl
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 
 %description -n cyrus-sasl-sqlauxprop
 The SQL auxprop plugin supports PostgreSQL and MySQL
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %prep
 %setup -n cyrus-sasl-%{version} -a 1
 %patch
@@ -139,7 +117,7 @@ export CPPFLAGS=-I/usr/include/heimdal
                 --enable-ldapdb=yes \
 		--with-pam \
 		--with-ldap
-make sasldir=%{_libdir}/sasl2
+make sasldir=%{_libdir}/sasl2 %{?_smp_mflags}
 
 %install
 cd plugins
@@ -173,9 +151,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsql.la
 %post
 %{fillup_and_insserv -n saslauthd}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 /var/adm/fillup-templates/sysconfig.saslauthd

cyrus-sasl.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Sep 18 00:16:04 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+-------------------------------------------------------------------
+Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
+
+- use %_smp_mflags
+
 -------------------------------------------------------------------
 Mon Jun  7 06:15:02 UTC 2010 - coolo@novell.com
 

cyrus-sasl.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package cyrus-sasl (Version 2.1.23)
+# spec file for package cyrus-sasl
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           cyrus-sasl
 Version:        2.1.23
-Release:        7
+Release:        14
 BuildRequires:  db-devel krb5-mini-devel openssl-devel opie pam-devel
 Obsoletes:      cyrus-sasl2 <= %{version}
 Provides:       cyrus-sasl2 = %{version}
 License:        BSD4c(or similar)
 Group:          Productivity/Networking/Other
 Url:            http://asg.web.cmu.edu/sasl/
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      cyrus-sasl-64bit
@@ -52,7 +50,6 @@ License:        BSD4c(or similar)
 Obsoletes:      cyrus-sasl2-gssapi <= %{version}
 Provides:       cyrus-sasl2-gssapi = %{version}
 Summary:        cyrus-sasl plugin for the GSSAPI mechanism
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 #
@@ -60,7 +57,6 @@ Requires:       cyrus-sasl
 %package      crammd5
 License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the CRAMMD5 mechanism
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 # cyrus-sasl2 was split in to several subpackages 
@@ -72,7 +68,6 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libcrammd5.so
 %package      digestmd5
 License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the DIGESTMD5 mechanism
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 # cyrus-sasl2 was split in to several subpackages 
@@ -84,7 +79,6 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libdigestmd5.so
 %package      otp
 License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the OTP mechanism
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 # cyrus-sasl2 was split in to several subpackages 
@@ -96,7 +90,6 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libotp.so
 %package      plain
 License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the PLAIN mechanism
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
 # cyrus-sasl2 was split in to several subpackages 
@@ -108,7 +101,6 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libplain.so
 %package      ntlm
 License:        BSD4c(or similar)
 Summary:        Implementation of Cyrus SASL API
-AutoReqProv:    on
 Group:          Productivity/Networking/Other
 Requires:       cyrus-sasl
 #
@@ -123,7 +115,6 @@ Obsoletes:      cyrus-sasl-devel-64bit
 %endif
 #
 Summary:        Cyrus SASL API Implementation, Libraries and Header Files
-AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl = %{version}, glibc-devel
 
@@ -131,87 +122,39 @@ Requires:       cyrus-sasl = %{version}, glibc-devel
 This is the Cyrus SASL API. It can be used on the client or server side
 to provide authentication. See RFC 2222 for more information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description gssapi
 This is the Cyrus SASL API implementation. It can be used on the client
 or server side to provide authentication. See RFC 2222 for more
 information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description devel
 This is the Cyrus SASL API. It can be used on the client or server side
 to provide authentication. See RFC 2222 for more information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description digestmd5
 This is the Cyrus SASL API implementation. It can be used on the client
 or server side to provide authentication. See RFC 2222 for more
 information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description crammd5
 This is the Cyrus SASL API implementation. It can be used on the client
 or server side to provide authentication. See RFC 2222 for more
 information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description otp
 This is the Cyrus SASL API implementation. It can be used on the client
 or server side to provide authentication. See RFC 2222 for more
 information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description plain
 This is the Cyrus SASL API implementation. It can be used on the client
 or server side to provide authentication. See RFC 2222 for more
 information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %description ntlm
 This is the Cyrus SASL API. It can be used on the client or server side
 to provide authentication. See RFC 2222 for more information.
 
-
-
-Authors:
---------
-    <tech-transfer> tech-transfer@andrew.cmu.edu
-
 %prep
 %setup -q -n cyrus-sasl-%{version} -a 1
 if [ -e %{_builddir}/%{name}-%{version}/dlcompat-*/ ]
@@ -260,7 +203,7 @@ export CPPFLAGS=-I/usr/include/heimdal
 		--enable-krb4=no \
                 --enable-sql=no \
 		--with-devrandom=/dev/urandom
-%{__make} %{?jobs:-j%jobs} sasldir=%{_libdir}/sasl2
+%{__make} %{?_smp_mflags} sasldir=%{_libdir}/sasl2
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
@@ -280,9 +223,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} +
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %dir %{_libdir}/sasl2