SPECS: sablotron.spec - added link patch and devel deps - updated ...

[qboosh]

Author: qboosh                       Date: Sat May 27 16:29:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added link patch and devel deps
- updated javascript bcond, moved api docs to -devel

---- Files affected:
SPECS:
   sablotron.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/sablotron.spec
diff -u SPECS/sablotron.spec:1.38 SPECS/sablotron.spec:1.39
--- SPECS/sablotron.spec:1.38	Sat May 27 14:38:33 2006
+++ SPECS/sablotron.spec	Sat May 27 18:29:41 2006
@@ -14,6 +14,7 @@
 #Source0Download:	http://www.gingerall.com/charlie/ga/xml/d_sab.xml
 Source0:	http://download-1.gingerall.cz/download/sablot/Sablot-%{version}.tar.gz
 # Source0-md5:	12243bc21b149cad89e98bc89f9c103e
+Patch0:		%{name}-link.patch
 URL:		http://www.gingerall.com/charlie/ga/xml/p_sab.xml
 BuildRequires:	autoconf >= 2.56
 BuildRequires:	automake
@@ -21,8 +22,8 @@
 %{?with_javascript:BuildRequires:	js-devel}
 BuildRequires:	libtool
 BuildRequires:	perl-XML-Parser
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	libsablotron0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Sablotron is an attempt to develop fast, compact and portable XSLT
@@ -55,6 +56,9 @@
 Summary(pt_BR):	Arquivos de inclusăo do sablotron
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	expat-devel >= 1.95.6-2
+%{?with_javascript:Requires:	js-devel}
+Requires:	libstdc++-devel
 Obsoletes:	libsablotron0-devel
 
 %description devel
@@ -89,6 +93,7 @@
 
 %prep
 %setup -q -n Sablot-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -96,11 +101,9 @@
 %{__autoconf}
 %{__automake}
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
-CXX="%{__cc}"
-export CXXFLAGS CXX
 %{?with_javascript:CPPFLAGS="-I/usr/include/js"}
 %configure \
-	%{?with_javascript:--enable-javascript}
+	%{?with_javascript:--with-js}
 %{__make}
 
 %install
@@ -110,6 +113,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/doc/html
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,24 +123,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README RELEASE doc/misc/{DEBUGGER,NOTES} doc/apidoc/{sablot,sxp}
-%if %{with javascript}
-%doc README_JS doc/apidoc/jsdom-ref
-%endif
+%doc README RELEASE doc/misc/{DEBUGGER,NOTES} %{?with_javascript:README_JS}
 %attr(755,root,root) %{_bindir}/sabcmd
-%attr(755,root,root) %{_libdir}/libsablot.so.*.*
+%attr(755,root,root) %{_libdir}/libsablot.so.*.*.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/apidoc/{sablot,sxp} %{?with_javascript:doc/apidoc/jsdom-ref}
 %attr(755,root,root) %{_bindir}/sablot-config
-%attr(755,root,root) %{_libdir}/libs*.so
-%{_libdir}/libs*.la
-%{_includedir}/s*
+%attr(755,root,root) %{_libdir}/libsablot.so
+%{_libdir}/libsablot.la
+%{_includedir}/s*.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsablot.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -143,6 +146,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/05/27 16:29:41  qboosh
+- added link patch and devel deps
+- updated javascript bcond, moved api docs to -devel
+
 Revision 1.38  2006/05/27 12:38:33  ciesiel
 - upgraded to version 1.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sablotron.spec?r1=1.38&r2=1.39&f=u