clean spec

diff --git a/packaging/libwbxml2.spec b/packaging/libwbxml2.spec
index f63402cb156c7715b01b83c6f80a5664322f5bf0..85b06bdddbc181f74f705f474aa596f3b31ce67d 100644 (file)
--- a/packaging/libwbxml2.spec
+++ b/packaging/libwbxml2.spec
@@ -1,13 +1,17 @@
 Name:           libwbxml2
-BuildRequires:  cmake gcc-c++ libexpat-devel pkg-config popt-devel zlib-devel
-Url:            http://libwbxml.opensync.org/
-License:        LGPL-2.1+
-Group:          System/Libraries
-Summary:        WBXML parser and compiler library
 Version:        0.11.2
 Release:        1
-AutoReqProv:    on
+License:        LGPL-2.1+
+Summary:        WBXML parser and compiler library
+Url:            http://libwbxml.opensync.org/
+Group:          System/Libraries
 Source:         libwbxml-%{version}.tar.bz2
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(pkg-config)
+BuildRequires:  pkgconfig(popt)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 wbxml2 is a library that includes a WBXML parser and a WBXML compiler.
@@ -17,14 +21,13 @@ associated tools to Parse, Encode and Handle WBXML documents. The WBXML
 (Wireless Binary XML) format is a binary representation of XML, and it
 has been defined by the Wap Forum.
 
-
 %package -n wbxml2-tools
 License:        GPL-2.0+
 Summary:        Tools for libwbxml2
 Group:          Productivity/Other
-Requires:       libwbxml2 = %{version} 
+Requires:       libwbxml2 = %{version}
 
-%description -n wbxml2-tools 
+%description -n wbxml2-tools
 wbxml2 is a library that includes a WBXML parser and a WBXML compiler.
 Unlike wbxml, it does not depend on libxml2 but on expat, making it
 faster and more portable. WBXML Library contains a library and its
@@ -36,9 +39,11 @@ has been defined by the Wap Forum.
 License:        LGPL-2.1+
 Summary:        WBXML parser and compiler library
 Group:          Development/Libraries/C and C++
-Requires:       libwbxml2 = %{version} glibc-devel libexpat-devel 
+Requires:       glibc-devel
+Requires:       libwbxml2 = %{version}
+Requires:       pkgconfig(expat)
 
-%description devel 
+%description devel
 wbxml2 is a library that includes a WBXML parser and a WBXML compiler.
 Unlike wbxml, it does not depend on libxml2 but on expat, making it
 faster and more portable. WBXML Library contains a library and its
@@ -46,13 +51,11 @@ associated tools to Parse, Encode and Handle WBXML documents. The WBXML
 (Wireless Binary XML) format is a binary representation of XML, and it
 has been defined by the Wap Forum.
 
-
-
 %prep
 %setup -q -n libwbxml-%{version}
 
 %build
-%__mkdir build
+mkdir build
 pushd build
 CFLAGS="%{optflags}" \
 CXXFLAGS="%{optflags}" \
@@ -64,7 +67,7 @@ cmake \
         -DLIB_SUFFIX=64 \
 %endif
          %{_builddir}/libwbxml-%{version}
-%__make %{?jobs:-j%jobs} VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1
 popd
 
 %install
@@ -76,7 +79,7 @@ popd
 
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-, root, root)
 %doc COPYING
 %{_libdir}/libwbxml2.so.1*
@@ -85,12 +88,12 @@ popd
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/libwbxml2.pc
 %{_libdir}/libwbxml2.so
-%{_prefix}/include/libwbxml-1.0/wbxml
+%{_includedir}/libwbxml-1.0/wbxml
 %{_datadir}/cmake/Modules/FindLibWbxml2.cmake
 
 %files -n wbxml2-tools
 %defattr(-,root,root)
-%{_prefix}/bin/wbxml2xml
-%{_prefix}/bin/xml2wbxml
+%{_bindir}/wbxml2xml
+%{_bindir}/xml2wbxml
 
 %changelog