Author: atler                        Date: Mon Jan 17 21:17:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9.0-pre4
- tarball includes prebuilt docs so drop unneeded reqs and toggle doc bcond
- install-exec installs all but docs
- package UPGRADING file

---- Files affected:
packages/libdbi:
   libdbi.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: packages/libdbi/libdbi.spec
diff -u packages/libdbi/libdbi.spec:1.45 packages/libdbi/libdbi.spec:1.46
--- packages/libdbi/libdbi.spec:1.45    Thu Nov 11 14:16:40 2010
+++ packages/libdbi/libdbi.spec Mon Jan 17 22:17:08 2011
@@ -2,14 +2,10 @@
 #
 # Conditional build:
 %bcond_without static_libs     # don't build static library
-%if "%{pld_release}" == "ti"
-%bcond_with    doc             # build documentation
-%else
-%bcond_with    doc             # build documentation
-%endif
+%bcond_without doc             # don't build documentation
 
-%define                subver  20100921
-%define                rel             2
+%define                subver  pre4
+%define                rel     1
 Summary:       Database Independent Abstraction Layer for C
 Summary(pl.UTF-8):     Warstwa abstrakcji baz danych dla C
 Name:          libdbi
@@ -17,35 +13,12 @@
 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: 451346912fdd1c8f66c5942d7f9a99b3
+Source0:       
http://libdbi.sourceforge.net/downloads/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: 0e159eafad1240c798e9f5b26cce3330
 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
-BuildRequires: tetex-fonts-type1-urw
-%else
-BuildRequires: texlive-fonts-ams
-BuildRequires: texlive-fonts-marvosym
-BuildRequires: texlive-fonts-stmaryrd
-BuildRequires: texlive-fonts-type1-urw
-BuildRequires: texlive-format-pdflatex
-BuildRequires: texlive-latex-ams
-BuildRequires: texlive-latex-extend
-BuildRequires: texlive-latex-wasysym
-BuildRequires: texlive-xetex
-BuildRequires: texlive-xmltex
-%endif
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -98,7 +71,7 @@
 Dokumentacja dla programistów używających warstwy DBI w C.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{subver}
 
 %build
 %{__libtoolize}
@@ -107,21 +80,16 @@
 %{__automake}
 %{__autoconf}
 %configure \
-       %{!?with_static_libs:--disable-static} \
-       %{!?with_doc:--disable-docs}
+       %{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/dbd,%{_pkgconfigdir}}
 
-%{__make} install \
+%{__make} install-exec \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with doc}
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -130,7 +98,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO UPGRADING
 %attr(755,root,root) %{_libdir}/libdbi.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdbi.so.1
 %dir %{_libdir}/dbd
@@ -159,6 +127,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2011/01/17 21:17:08  atler
+- up to 0.9.0-pre4
+- tarball includes prebuilt docs so drop unneeded reqs and toggle doc bcond
+- install-exec installs all but docs
+- package UPGRADING file
+
 Revision 1.45  2010/11/11 13:16:40  atler
 - pkg-config configuration file now provided by upstream
 - rel 2
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to