- drop -doc, move files to most appropriate package instead

Changed files:
    dtc.spec -> 1.9

diff --git a/dtc.spec b/dtc.spec
index 05f71f0f75a282295b24184269e773f498bf2277..e17cee63a12e43b8079d7f22e28fae8a467ed759 100644 (file)
--- a/dtc.spec
+++ b/dtc.spec
@@ -1,12 +1,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
@@ -14,8 +14,8 @@ Source0:      http://www.jdl.com/software/%{name}-v%{version}.tgz
 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}
@@ -37,7 +37,7 @@ inaczej format binarny.
 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
@@ -50,9 +50,9 @@ Biblioteka drzewiastej struktury urządzeń.
 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
@@ -74,17 +74,6 @@ Static fdt library.
 %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}
 
@@ -97,19 +86,20 @@ Dokumentacja pakietu dtc.
 %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
@@ -122,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -129,7 +120,3 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libfdt-static
 %defattr(644,root,root,755)
 %{_libdir}/libfdt.a
-
-%files doc
-%defattr(644,root,root,755)
-%doc TODO README.license Documentation/manual.txt