Accepting request 78108 from Publishing

- Cleanup the spec file
- Add BuildRequires on pkg-config because the package installs a 
  pkgconfig file.
- Enable strict-aliasing again since the code seems to be fixed. (forwarded request 77702 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/78108
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yaz?expand=0&rev=22

yaz.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug  2 15:25:11 UTC 2011 - idonmez@novell.com
+
+- Cleanup the spec file
+- Add BuildRequires on pkg-config because the package installs a 
+  pkgconfig file.
+- Enable strict-aliasing again since the code seems to be fixed.
+
 -------------------------------------------------------------------
 Wed May 25 09:43:11 CEST 2011 - ke@suse.de
 

yaz.spec

@@ -15,34 +15,33 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           yaz
-BuildRequires:  libicu-devel libpcap-devel libxslt-devel openssl-devel readline-devel tcpd-devel
 # libxml2-devel
 Version:        4.2.0
 Release:        1
 License:        BSD3c(or similar)
+Summary:        Z39.50/SRW/SRU Programs
+Url:            http://www.indexdata.dk/yaz/
 Group:          Development/Libraries/C and C++
 Source:         http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz
 Patch0:         yaz-4.1.7-codecleanup.diff
 Patch1:         yaz-4.1.7-client.diff
+BuildRequires:  libicu-devel
+BuildRequires:  libpcap-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel
+BuildRequires:  tcpd-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://www.indexdata.dk/yaz/
-Summary:        Z39.50/SRW/SRU Programs
 
 %description
 This package contains both a test-server and clients (normal & ssl) for
 the ANSI/NISO Z39.50 protocol for Information Retrieval.  SRW and SRU
 clients and servers are also supported.
 
-
-
-Authors:
---------
-    Adam Dickmeiss <adam@indexdata.dk>
-
 %package -n libyaz
 License:        BSD3c(or similar)
 Summary:        Z39.50 Library
@@ -54,29 +53,20 @@ Group:          Development/Libraries/C and C++
 YAZ is a C library for developing client - and server applications
 using the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-
-
-Authors:
---------
-    Adam Dickmeiss <adam@indexdata.dk>
-
 %package -n libyaz-devel
 License:        BSD3c(or similar)
 Summary:        Z39.50 Library
 Group:          Development/Libraries/C and C++
+Requires:       libicu-devel
+Requires:       libopenssl-devel
+Requires:       libxslt-devel
 Requires:       libyaz = %{version}
-Requires:       libxslt-devel tcpd-devel libopenssl-devel libicu-devel
+Requires:       tcpd-devel
 
 %description -n libyaz-devel
 YAZ is a C library for developing client - and server applications
 using the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-
-
-Authors:
---------
-    Adam Dickmeiss <adam@indexdata.dk>
-
 %prep
 %setup -q
 %patch0 -p 1
@@ -85,23 +75,22 @@ Authors:
 %build
 #  --with-dsssl=/usr/share/sgml/docbook/dsssl-stylesheets \
 #  --with-dtd=/usr/share/sgml/db41xml
-export CFLAGS="%{optflags} -W -fno-strict-aliasing"
 %configure --enable-shared \
 		   --enable-tcpd \
 		   --with-xslt \
            --with-openssl \
 		   --disable-static \
 		   --with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %{makeinstall}
 #pushd doc
-  # make prefix=${RPM_BUILD_ROOT}/usr install
-#  make DESTDIR=${RPM_BUILD_ROOT} install
+  # make prefix=%{buildroot}/usr install
+#  make DESTDIR=%{buildroot} install
 #popd
 # Unwanted doc stuff
-rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
+rm -fr %{buildroot}%{_datadir}/doc
 rm -fr html
 mkdir html
 cp -a doc/*.html html
@@ -123,11 +112,11 @@ ln -sf introduction.html html/index.html
   done
   echo "</li></body></html>"
 } >index.html
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+/sbin/ldconfig -n %{buildroot}%{_libdir}
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -fr ${RPM_BUILD_ROOT}
+rm -fr %{buildroot}
 
 %post -n libyaz -p /sbin/ldconfig