[libticonv] Fixed docs subpackage to not conflict with some files in the main package.

Ben Rosser tc01 at fedoraproject.org
Sat Feb 28 04:51:19 UTC 2015


commit 432234f99e9b13d9e874d8215cd94530375151e2
Author: Ben Rosser <rosser.bjr at gmail.com>
Date:   Fri Feb 27 23:51:14 2015 -0500

    Fixed docs subpackage to not conflict with some files in the main package.

 libticonv.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/libticonv.spec b/libticonv.spec
index 88e5e96..3da5320 100644
--- a/libticonv.spec
+++ b/libticonv.spec
@@ -2,7 +2,7 @@
 
 Name:           libticonv
 Version:        1.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Texas Instruments calculators charsets library
 
 Group:          Development/Libraries
@@ -20,9 +20,9 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %package doc
 
-Group:          Development/Libraries
+Group:          Documentation
 Summary:        HTML documentation for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildArch:      noarch
 
 %description
 The ticonv library is a library capable of conversions between
@@ -45,7 +45,6 @@ sed -i 's/\r$//' AUTHORS
 sed -i 's/\r$//' docs/html/clean.bat
 sed -i 's/\r$//' docs/html/style.css
 
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -53,26 +52,31 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/libticonv.la
-cd docs
-make install DESTDIR=%{buildroot}
+make -C docs install DESTDIR=%{buildroot}
+rm %{buildroot}/%{_pkgdocdir}/COPYING
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %{_libdir}/libticonv.so.*
-%doc README AUTHORS
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/AUTHORS
+%doc %{_pkgdocdir}/ChangeLog
 %license COPYING
 
+%files doc
+%doc %{_pkgdocdir}/html/
+
 %files devel
 %{_libdir}/libticonv.so
 %{_libdir}/pkgconfig/ticonv.pc
 %{_includedir}/tilp2/
 
-%files doc
-%doc %{_docdir}/libticonv
-
 %changelog
+* Fri Feb 27 2015 'Ben Rosser' <rosser.bjr at gmail.com> 1.1.4-4
+- Fixed doc subpackage to be noarch and not contain duplicate files.
+
 * Mon Feb 16 2015 'Ben Rosser' <rosser.bjr at gmail.com> 1.1.4-3
 - Added a doc subpackage for the HTML documentation.
 


More information about the scm-commits mailing list