Fix duplicate documentation (#1001258) by using only %doc magic
- pkgconfig dep is automatic - Use %?_isa in -devel base package dep
This commit is contained in:
parent
84b0d9378a
commit
e3f251c53e
19
dotconf.spec
19
dotconf.spec
@ -1,6 +1,6 @@
|
||||
Name: dotconf
|
||||
Version: 1.3
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Summary: Libraries to parse configuration files
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -16,8 +16,9 @@ Dotconf is a library used to handle configuration files.
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# pkgconfig deps are automatic in Fedora and EL>=6
|
||||
#Requires: pkgconfig
|
||||
|
||||
|
||||
%description devel
|
||||
@ -29,7 +30,7 @@ developing applications that use %{name}.
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%configure --disable-static --docdir=%{_datadir}/doc/%{name}-devel-%{version}
|
||||
%configure --disable-static
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -42,6 +43,9 @@ mv iconv.tmp doc/dotconf-features.txt
|
||||
rm examples/maketest.sh
|
||||
find %{buildroot} -type f -name "*.a" -o -name "*.la" | xargs rm -f
|
||||
|
||||
# move installed docs to include them in -devel package via %%doc magic
|
||||
rm -rf __tmp_doc ; mkdir __tmp_doc
|
||||
mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/* __tmp_doc
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
@ -52,12 +56,17 @@ find %{buildroot} -type f -name "*.a" -o -name "*.la" | xargs rm -f
|
||||
%{_libdir}/libdotconf*.so.*
|
||||
|
||||
%files devel
|
||||
%doc %{_docdir}
|
||||
%doc __tmp_doc/*
|
||||
%{_libdir}/libdotconf*.so
|
||||
%{_includedir}/dotconf.h
|
||||
%{_libdir}/pkgconfig/dotconf.pc
|
||||
|
||||
%changelog
|
||||
* Sat Dec 14 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3-8
|
||||
- Fix duplicate documentation (#1001258) by using only %%doc magic
|
||||
- pkgconfig dep is automatic
|
||||
- Use %%?_isa in -devel base package dep
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user