packages: dtc/dtc.spec - drop -doc, move files to most appropriate package ...

[glen]

Author: glen                         Date: Sat Apr  7 12:45:55 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop -doc, move files to most appropriate package instead

---- Files affected:
packages/dtc:
   dtc.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/dtc/dtc.spec
diff -u packages/dtc/dtc.spec:1.8 packages/dtc/dtc.spec:1.9
--- packages/dtc/dtc.spec:1.8	Sun Feb 19 16:26:59 2012
+++ packages/dtc/dtc.spec	Sat Apr  7 14:45:50 2012
@@ -2,12 +2,12 @@
 #
 # Conditional build:
 %bcond_without	verbose		# verbose build (V=1)
-#
+
 Summary:	The Device Tree Compiler
-Summary(pl.UTF-8): Kompilator drzewiastej struktury urządzeń
+Summary(pl.UTF-8):	Kompilator drzewiastej struktury urządzeń
 Name:		dtc
 Version:	1.3.0
-Release:	1
+Release:	2
 License:	GPL v2 (dtc), GPL/BSD (fdt library)
 Group:		Libraries
 Source0:	http://www.jdl.com/software/%{name}-v%{version}.tgz
@@ -15,8 +15,8 @@
 URL:		http://git.jdl.com/gitweb/
 BuildRequires:	bison
 BuildRequires:	flex
-Requires:	%{name}-doc = %{version}-%{release}
 Requires:	libfdt = %{version}-%{release}
+Obsoletes:	dtc-doc < 1.3.0-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %{?debug:%define with_verbose 1}
@@ -38,7 +38,7 @@
 Summary:	Device tree library
 Summary(pl.UTF-8):	Biblioteka drzewiastej struktury urządzeń
 Group:		Libraries
-Requires:	%{name}-doc = %{version}-%{release}
+Obsoletes:	dtc-doc < 1.3.0-2
 # does not require base. see README.license
 
 %description -n libfdt
@@ -51,9 +51,9 @@
 Summary:	Header files for fdt library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki fdt
 Group:		Development/Libraries
-Requires:	%{name}-doc = %{version}-%{release}
 Requires:	libfdt = %{version}-%{release}
 Obsoletes:	dtc-devel
+Obsoletes:	dtc-doc < 1.3.0-2
 # does not require base. see README.license
 
 %description -n libfdt-devel
@@ -75,17 +75,6 @@
 %description -n libfdt-static -l pl.UTF-8
 Statyczna biblioteka fdt.
 
-%package doc
-Summary:        Dtc documentation
-Summary(pl.UTF-8):      Dokumentacja dla dtc
-Group:          Development/Libraries
-
-%description doc
-Dtc package documentation.
-
-%description doc -l pl.UTF-8
-Dokumentacja pakietu dtc.
-
 %prep
 %setup -q -n %{name}-v%{version}
 
@@ -98,19 +87,20 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	%{?with_verbose:V=1} \
 	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir} \
-	DESTDIR=$RPM_BUILD_ROOT
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-n libfdt -p /sbin/ldconfig
-%postun	-n libfdt -p /sbin/ldconfig 
+%postun	-n libfdt -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
+%doc README.license
 %attr(755,root,root) %{_bindir}/convert-dtsv0
 %attr(755,root,root) %{_bindir}/dtc
 %attr(755,root,root) %{_bindir}/dtdiff
@@ -123,6 +113,7 @@
 
 %files -n libfdt-devel
 %defattr(644,root,root,755)
+%doc TODO Documentation/manual.txt
 %attr(755,root,root) %{_libdir}/libfdt.so
 %{_includedir}/fdt.h
 %{_includedir}/libfdt.h
@@ -131,16 +122,15 @@
 %defattr(644,root,root,755)
 %{_libdir}/libfdt.a
 
-%files doc
-%defattr(644,root,root,755)
-%doc TODO README.license Documentation/manual.txt
-
 %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.9  2012/04/07 12:45:50  glen
+- drop -doc, move files to most appropriate package instead
+
 Revision 1.8  2012/02/19 15:26:59  qboosh
 - defattr for -doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dtc/dtc.spec?r1=1.8&r2=1.9