Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[packaging] Add glibc-doc subpackage. Contributes to JB#24119
Signed-off-by: Tomi Leppänen <tomi.leppanen@jolla.com>
  • Loading branch information
Tomin1 committed Feb 18, 2019
1 parent 79bc5a4 commit 0a73762
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 22 deletions.
3 changes: 3 additions & 0 deletions glibc.changes
@@ -1,3 +1,6 @@
* Mon Feb 18 2019 Tomi Leppänen <tomi.leppanen@jolla.com> - 2.25+git3
- Add glibc-doc subpackage. Contributes to JB#24119

* Mon Feb 18 2019 Niels Breet <niels.breet@jolla.com> - 2.25+git2
- Change pthread configure params, contributes to JB#36174
- Added gnu target
Expand Down
52 changes: 30 additions & 22 deletions glibc.spec
@@ -1,7 +1,7 @@
Name: glibc

Summary: GNU C library shared libraries
Version: 2.25+git2
Version: 2.25+git3
Release: 0
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries
Expand Down Expand Up @@ -177,6 +177,14 @@ The glibc-debug package contains debug libraries.

If unsure if you need this, don't install this package.

%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description doc
%{summary}.

%prep
rm -rf glibc-2.25
xz -dc %SOURCE0 | tar -x
Expand Down Expand Up @@ -409,23 +417,22 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo

# the last bit: more documentation
rm -rf ../documentation
mkdir ../documentation
cp ../glibc-2.25/crypt/README.ufc-crypt ../documentation/README.ufc-crypt
cp ../glibc-2.25/timezone/README ../documentation/README.timezone
cp ../glibc-2.25/ChangeLog{,.15,.16} ../documentation
bzip2 -9 ../documentation/ChangeLog*
cp ../glibc-2.25/posix/gai.conf ../documentation/

# Docs
cp ../glibc-2.25/COPYING ..
cp ../glibc-2.25/LICENSES ..
cp ../glibc-2.25/COPYING.LIB ..
cp ../glibc-2.25/README ..
cp ../glibc-2.25/NEWS ..
cp ../glibc-2.25/INSTALL ..
cp ../glibc-2.25/BUGS ..
cp ../glibc-2.25/CONFORMANCE ..
install -D ../glibc-2.25/hesiod/README.hesiod ../hesiod/README.hesiod
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
bzip2 -9 ../glibc-2.25/ChangeLog*
install -m0644 -t $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
../glibc-2.25/crypt/README.ufc-crypt \
../glibc-2.25/ChangeLog{,.16,.17}.bz2 \
../glibc-2.25/posix/gai.conf \
../glibc-2.25/README \
../glibc-2.25/NEWS \
../glibc-2.25/INSTALL \
../glibc-2.25/BUGS \
../glibc-2.25/CONFORMANCE \
../glibc-2.25/hesiod/README.hesiod
install -m0644 ../glibc-2.25/timezone/README \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.timezone

cp ../glibc-2.25/{COPYING,COPYING.LIB,LICENSES} ..

%if 0%{run_glibc_tests}

Expand Down Expand Up @@ -524,7 +531,7 @@ fi
%dir %attr(0700,root,root) /var/cache/ldconfig
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
%doc COPYING COPYING.LIB LICENSES
%license COPYING COPYING.LIB LICENSES


%ifnarch %{auxarches}
Expand All @@ -533,12 +540,9 @@ fi
%dir %{_prefix}/lib/locale
%dir %attr(755,root,root) /etc/default
%verify(not md5 size mtime) %config(noreplace) /etc/default/nss
%doc documentation/*

%files -f build-%{name}-%{version}/devel.filelist devel
%defattr(-,root,root)
%doc README NEWS INSTALL BUGS CONFORMANCE
%doc hesiod/README.hesiod

%files -f build-%{name}-%{version}/static.filelist static
%defattr(-,root,root)
Expand Down Expand Up @@ -570,3 +574,7 @@ fi
%files debug
%defattr(-,root,root)
%{_prefix}/%{_lib}/debug/usr/lib/*

%files doc
%defattr(-,root,root)
%{_docdir}/%{name}-%{version}

0 comments on commit 0a73762

Please sign in to comment.