packages: libdbi/libdbi.spec - cleanup

[qboosh]

Author: qboosh                       Date: Sun Oct 24 11:52:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup

---- Files affected:
packages/libdbi:
   libdbi.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/libdbi/libdbi.spec
diff -u packages/libdbi/libdbi.spec:1.43 packages/libdbi/libdbi.spec:1.44
--- packages/libdbi/libdbi.spec:1.43	Wed Oct 13 14:50:27 2010
+++ packages/libdbi/libdbi.spec	Sun Oct 24 13:52:49 2010
@@ -3,15 +3,15 @@
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 %if "%{pld_release}" == "ti"
-%bcond_with	doc		# don't build documentation
+%bcond_with	doc		# build documentation
 %else
-%bcond_with	doc		# don't build documentation
+%bcond_with	doc		# build documentation
 %endif
 
 %define		subver	20100921
 %define		rel		1
 Summary:	Database Independent Abstraction Layer for C
-Summary(pl.UTF-8):	Warstwa DBI dla C
+Summary(pl.UTF-8):	Warstwa abstrakcji baz danych dla C
 Name:		libdbi
 Version:	0.9.0
 Release:	0.%{subver}.%{rel}
@@ -71,20 +71,8 @@
 applications with libdbi.
 
 %description devel -l pl.UTF-8
-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
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji z użyciem
+libdbi.
 
 %package static
 Summary:	Static Database Independent Abstraction Layer for C libraries
@@ -98,6 +86,17 @@
 %description static -l pl.UTF-8
 Statyczne biblioteki warstwy DBI w C.
 
+%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.
+
 %prep
 %setup -q -n %{name}
 
@@ -119,7 +118,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}
@@ -133,7 +132,7 @@
 EOF
 
 %if %{with doc}
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
 %endif
 
 %clean
@@ -156,23 +155,26 @@
 %{_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)
 %{_libdir}/libdbi.a
 %endif
 
+%if %{with doc}
+%files doc
+%doc doc/driver-guide doc/driver-guide.pdf doc/programmers-guide doc/programmers-guide.pdf
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2010/10/24 11:52:49  qboosh
+- cleanup
+
 Revision 1.43  2010/10/13 12:50:27  atler
 - toggle doc bcond until proper jadetex is provided
 
================================================================

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