rpms/xqilla/devel xqilla.spec,1.20,1.21

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/xqilla/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17858

Modified Files:
	xqilla.spec 
Log Message:
xqilla.spec clean up



Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/xqilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xqilla.spec	8 Mar 2010 20:27:01 -0000	1.20
+++ xqilla.spec	14 May 2010 14:34:47 -0000	1.21
@@ -1,20 +1,16 @@
-Name: xqilla
-Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Group: System Environment/Libraries
-Version: 2.2.3
-Release: 7%{?dist}
-License: ASL 2.0
-URL: http://xqilla.sourceforge.net/HomePage
-Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
-
-Requires: libstdc++ >= 4.1.1 xerces-c >= 3.0.1
-
-# BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: xerces-c-devel >= 3.0.1 
-BuildRequires: autoconf automake libtool
-BuildRequires: doxygen graphviz
+Name:           xqilla
+Version:        2.2.3
+Release:        8%{?dist}
+Summary:        XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
+
+Group:          System Environment/Libraries
+License:        ASL 2.0
+URL:            http://xqilla.sourceforge.net/HomePage
+Source0:        http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  xerces-c-devel >= 3.0.1 
+BuildRequires:  doxygen graphviz
 
 %description
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
@@ -22,45 +18,45 @@ on Xerces-C. It implements the DOM 3 XPa
 more powerful API. It conforms to the W3C proposed recomendation of XQuery
 and XPath 2.0.
 
-%package devel
-Group: Development/Libraries
-Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Requires: xerces-c-devel >= 3.0.1
+%package        devel
+Summary:        XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       xerces-c-devel >= 3.0.1
 
-%description devel
+%description    devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
 on Xerces-C. It implements the DOM 3 XPath API, as well as having it's own
 more powerful API. It conforms to the W3C proposed recomendation of XQuery
 and XPath 2.0.
 
-%package doc
-Group: Documentation
-Summary: XQilla documentation
+%package        doc
+Summary:        XQilla documentation
+Group:          Documentation
+BuildArch:      noarch
 
-%description doc
+%description    doc
 simple-api and dom3-api documentation for XQilla.
 
 %prep
-%setup -qn XQilla-2.2.3
+%setup -qn XQilla-%{version}
 
 %build
-%configure --with-xerces=/usr --disable-rpath
+%configure \
+  --disable-static \
+  --with-xerces=%{_prefix}
+
+# Avoid lib64 rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make
+
+make %{?_smp_mflags}
 make docs
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name '*.la' -exec rm -f '{}' ';'
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cp -pr ChangeLog LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cp -pr docs/dom3-api docs/simple-api \
-	%{buildroot}%{_defaultdocdir}/%{name}-%{version}
-for file in `find %{buildroot}%{_defaultdocdir}/%{name}-%{version}`; do\
-	if ! [ -s "$file" ]; then rm -f "$file"; fi;
-done
 
 %clean
 rm -rf %{buildroot}
@@ -71,27 +67,33 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc ChangeLog LICENSE
 %{_bindir}/xqilla
 %{_libdir}/libxqilla.so.*
-%dir %{_defaultdocdir}/%{name}-%{version}
-%{_defaultdocdir}/%{name}-%{version}/ChangeLog
-%{_defaultdocdir}/%{name}-%{version}/LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libxqilla.so
-%{_includedir}/xqilla
+%{_includedir}/xqilla/
 %{_includedir}/xqc.h
-%exclude %{_libdir}/libxqilla.a
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_defaultdocdir}/%{name}-%{version}
-%{_defaultdocdir}/%{name}-%{version}/dom3-api
-%{_defaultdocdir}/%{name}-%{version}/simple-api
+%doc docs/dom3-api/ docs/simple-api/
 
 
 %changelog
+* Fri May 14 2010 Kalev Lember <kalev at smartlink.ee> - 2.2.3-8
+- Require fully versioned main package for -devel subpackage
+- Don't build static library
+- Removed library Requires which are automatically picked up by rpm
+- Removed spurious BR autoconf automake libtool
+- Build -doc subpackage as noarch
+- Install documentation with %%doc macro
+- Use %%{_prefix} instead of hardcoding /usr
+- Use parallel make
+- Various other spec file clean ups
+
 * Mon Mar  8 2010 Jonathan Robie <jrobie at localhost.localdomain> - 2.2.3-7
 - Removed static library, per Fedora packaging guidelines.