packages: libdbi/libdbi.spec, libdbi/libdbi-borked_snapshot.patch (REMOVED)...

[atler]

Author: atler                        Date: Tue Sep 21 21:48:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20100921 snap
- libdbi-borked_snapshot.patch fixed upstream
- BR: docbook-style-dsssl openjade
- separate doc

---- Files affected:
packages/libdbi:
   libdbi.spec (1.41 -> 1.42) , libdbi-borked_snapshot.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libdbi/libdbi.spec
diff -u packages/libdbi/libdbi.spec:1.41 packages/libdbi/libdbi.spec:1.42
--- packages/libdbi/libdbi.spec:1.41	Wed May 19 23:57:38 2010
+++ packages/libdbi/libdbi.spec	Tue Sep 21 23:48:43 2010
@@ -8,26 +8,27 @@
 %bcond_without	doc		# don't build documentation
 %endif
 
-%define		subver	20090420
-%define		rel		3
+%define		subver	20100921
+%define		rel		1
 Summary:	Database Independent Abstraction Layer for C
 Summary(pl.UTF-8):	Warstwa DBI dla C
 Name:		libdbi
-Version:	0.8.4
+Version:	0.9.0
 Release:	0.%{subver}.%{rel}
 License:	LGPL v2+
 Group:		Libraries
 #Source0:	http://dl.sourceforge.net/libdbi/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{subver}.tar.gz
-# Source0-md5:	dcd546b78d4d406520caf802b24ec7c6
-Patch0:		%{name}-borked_snapshot.patch
+# Source0-md5:	451346912fdd1c8f66c5942d7f9a99b3
 URL:		http://libdbi.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 %if %{with doc}
 BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-style-dsssl
 BuildRequires:	jadetex
+BuildRequires:	openjade
 %if "%{pld_release}" == "ti"
 BuildRequires:	tetex-fonts-ams
 BuildRequires:	tetex-fonts-stmaryrd
@@ -66,12 +67,24 @@
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-The libdbi-devel package contains the header files and documentation
-needed to develop applications with libdbi.
+The libdbi-devel package contains the header files needed to develop
+applications with libdbi.
 
 %description devel -l pl.UTF-8
-Ten pakiet zawiera pliki nagłówkowe i dokumentację do tworzenia
-aplikacji z użyciem libdbi.
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji z użyciem libdbi.
+
+%if %{with doc}
+%package doc
+Summary:	Documentation for Database Independent Abstraction Layer for C
+Summary(pl.UTF-8):	Dokumentacja dla programistów używających warstwy DBI w C
+Group:		Documentation
+
+%description doc
+Documentation for Database Independent Abstraction Layer for C.
+
+%description devel -l pl.UTF-8
+Dokumentacja dla programistów używających warstwy DBI w C.
+%endif
 
 %package static
 Summary:	Static Database Independent Abstraction Layer for C libraries
@@ -87,9 +100,6 @@
 
 %prep
 %setup -q -n %{name}
-# snapshot hack below
-touch doc/libdbi-versioning.sgml
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -122,6 +132,10 @@
 Cflags: -I${includedir} -I${includedir}/dbi
 EOF
 
+%if %{with doc}
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,19 +146,21 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libdbi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdbi.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdbi.so.1
 %dir %{_libdir}/dbd
 
 %files devel
 %defattr(644,root,root,755)
-%if %{with doc}
-%doc doc/driver-guide doc/programmers-guide doc/programmers-guide.pdf
-%endif
 %attr(755,root,root) %{_libdir}/libdbi.so
 %{_libdir}/libdbi.la
 %{_includedir}/dbi
 %{_pkgconfigdir}/dbi.pc
 
+%if %{with doc}
+%files doc
+%doc doc/driver-guide doc/driver-guide.pdf doc/programmers-guide doc/programmers-guide.pdf
+%endif
+
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
@@ -157,6 +173,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/09/21 21:48:43  atler
+- up to 20100921 snap
+- libdbi-borked_snapshot.patch fixed upstream
+- BR: docbook-style-dsssl openjade
+- separate doc
+
 Revision 1.41  2010/05/19 21:57:38  sparky
 - doc BR: texlive-fonts-marvosym, texlive-format-pdflatex, texlive-latex-ams,
   texlive-latex-extend, texlive-latex-wasysym, texlive-xetex, texlive-xmltex
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libdbi/libdbi.spec?r1=1.41&r2=1.42&f=u