packages: libdbi/libdbi.spec - cosmetics, builds without doc; rel 2

[glen]

Author: glen                         Date: Thu Feb 25 10:31:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics, builds without doc; rel 2

---- Files affected:
packages/libdbi:
   libdbi.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/libdbi/libdbi.spec
diff -u packages/libdbi/libdbi.spec:1.38 packages/libdbi/libdbi.spec:1.39
--- packages/libdbi/libdbi.spec:1.38	Wed Apr 22 09:46:23 2009
+++ packages/libdbi/libdbi.spec	Thu Feb 25 11:31:27 2010
@@ -3,17 +3,18 @@
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 %bcond_without	doc			# don't build documentation
-#
+
+%define		subver	20090420
+%define		rel		2
 Summary:	Database Independent Abstraction Layer for C
 Summary(pl.UTF-8):	Warstwa DBI dla C
 Name:		libdbi
-%define	_snap	20090420
 Version:	0.8.4
-Release:	0.%{_snap}.1
+Release:	0.%{subver}.%{rel}
 License:	LGPL v2+
 Group:		Libraries
 #Source0:	http://dl.sourceforge.net/libdbi/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{_snap}.tar.gz
+Source0:	%{name}-%{subver}.tar.gz
 # Source0-md5:	dcd546b78d4d406520caf802b24ec7c6
 Patch0:		%{name}-borked_snapshot.patch
 URL:		http://libdbi.sourceforge.net/
@@ -21,11 +22,11 @@
 BuildRequires:	automake
 BuildRequires:	libtool
 %if %{with doc}
-BuildRequires:	jadetex
 BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	jadetex
 BuildRequires:	texlive-fonts-ams
-BuildRequires:	texlive-fonts-type1-urw
 BuildRequires:	texlive-fonts-stmaryrd
+BuildRequires:	texlive-fonts-type1-urw
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,7 +70,7 @@
 
 %prep
 %setup -q -n %{name}
-#snapshot hack below
+# snapshot hack below
 touch doc/libdbi-versioning.sgml
 %patch0 -p1
 
@@ -91,7 +92,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cat >$RPM_BUILD_ROOT/%{_pkgconfigdir}/dbi.pc <<EOF
+cat > $RPM_BUILD_ROOT/%{_pkgconfigdir}/dbi.pc <<'EOF'
 prefix=%{_prefix}
 exec_prefix=%{_prefix}
 libdir=%{_libdir}
@@ -100,8 +101,8 @@
 Name: libdbi
 Description: database-independent abstraction layer in C
 Version: %{version}
-Libs: -L\${libdir} -ldbi
-Cflags: -I\${includedir} -I\${includedir}/dbi
+Libs: -L${libdir} -ldbi
+Cflags: -I${includedir} -I${includedir}/dbi
 EOF
 
 %clean
@@ -139,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2010/02/25 10:31:27  glen
+- cosmetics, builds without doc; rel 2
+
 Revision 1.38  2009/04/22 07:46:23  mmazur
 - added doc bcond; BRs for texlive aren't complete though
 
@@ -215,7 +219,7 @@
 - added "rm -f missing" on top %build.
 
 Revision 1.14  2002/08/01 18:16:37  qboosh
-- working URL, new %%doc, use proper CFLAGS (opt patch)
+- working URL, new %doc, use proper CFLAGS (opt patch)
 
 Revision 1.13  2002/08/01 12:07:16  mwinkler
 - updated to 0.6.5, STBR
@@ -224,9 +228,9 @@
 - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
 
 Revision 1.11  2002/05/21 23:13:43  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.10  2002/03/24 23:28:20  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -239,7 +243,7 @@
   Group field using gettext).
 
 Revision 1.7  2002/01/18 02:13:37  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.6  2001/12/04 14:07:29  qboosh
 - pl translations, cosmetics
@@ -261,7 +265,7 @@
 - removed "postgresql >= 7.0.3" and "mysqlclient9 >= 3.23.22" Requires rules
   from dbd-* subpackes,
 - soem cleanups in %files,
-- added "Provides: %%{name}-dbd" for dbd-* subpackages adn "Require: %%{name}-dbd"
+- added "Provides: %{name}-dbd" for dbd-* subpackages adn "Require: %{name}-dbd"
   for main rules for prevent install libdbi without any dbd backend module.
 
 Revision 1.2  2001/08/06 14:56:51  wrobell
@@ -269,6 +273,3 @@
 
 Revision 1.1  2001/08/06 13:36:57  wrobell
 - based on original spec
-
-* Sat Aug 4 2001 David Parker <david at neongoat.com>
-- initial spec file created
================================================================

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