From 63e839b96956ca521c97c8d242b44ca30aeac178237b8e871b9243a75ee99822 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 28 Feb 2013 15:19:48 +0000 Subject: [PATCH] Accepting request 156848 from home:Andreas_Schwab:Factory - Remove debianisms from manpages (bnc#805054) OBS-URL: https://build.opensuse.org/request/show/156848 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=275 --- glibc-testsuite.changes | 5 +++++ glibc-testsuite.spec | 6 ++++++ glibc-utils.changes | 5 +++++ glibc-utils.spec | 6 ++++++ glibc.changes | 5 +++++ glibc.spec | 6 ++++++ manpages.patch | 43 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+) create mode 100644 manpages.patch diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index ea3d0ea..e4c3b12 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 28 14:30:44 UTC 2013 - schwab@suse.de + +- Remove debianisms from manpages (bnc#805054) + ------------------------------------------------------------------- Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index bb9b51c..386ea6c 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -258,6 +258,10 @@ Patch2010: nscd-short-write.patch # PATCH-FIX-OPENSUSE Use lib64 for aarch64 Patch2011: glibc-aarch64-lib64.patch +# Non-glibc patches +# PATCH-FIX-OPENSUSE Remove debianisms from manpages +Patch3000: manpages.patch + %description The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math @@ -465,6 +469,8 @@ rm nscd/s-stamp %patch2010 -p1 %patch2011 -p1 +%patch3000 + # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # diff --git a/glibc-utils.changes b/glibc-utils.changes index ea3d0ea..e4c3b12 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 28 14:30:44 UTC 2013 - schwab@suse.de + +- Remove debianisms from manpages (bnc#805054) + ------------------------------------------------------------------- Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index e156b39..9bb1191 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -257,6 +257,10 @@ Patch2010: nscd-short-write.patch # PATCH-FIX-OPENSUSE Use lib64 for aarch64 Patch2011: glibc-aarch64-lib64.patch +# Non-glibc patches +# PATCH-FIX-OPENSUSE Remove debianisms from manpages +Patch3000: manpages.patch + %description The glibc-utils package contains mtrace, a memory leak tracer and xtrace, a function call tracer which can be helpful during program @@ -465,6 +469,8 @@ rm nscd/s-stamp %patch2010 -p1 %patch2011 -p1 +%patch3000 + # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # diff --git a/glibc.changes b/glibc.changes index ea3d0ea..e4c3b12 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 28 14:30:44 UTC 2013 - schwab@suse.de + +- Remove debianisms from manpages (bnc#805054) + ------------------------------------------------------------------- Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index 660df2f..61ceb27 100644 --- a/glibc.spec +++ b/glibc.spec @@ -258,6 +258,10 @@ Patch2010: nscd-short-write.patch # PATCH-FIX-OPENSUSE Use lib64 for aarch64 Patch2011: glibc-aarch64-lib64.patch +# Non-glibc patches +# PATCH-FIX-OPENSUSE Remove debianisms from manpages +Patch3000: manpages.patch + %description The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math @@ -465,6 +469,8 @@ rm nscd/s-stamp %patch2010 -p1 %patch2011 -p1 +%patch3000 + # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # diff --git a/manpages.patch b/manpages.patch new file mode 100644 index 0000000..504238f --- /dev/null +++ b/manpages.patch @@ -0,0 +1,43 @@ +Index: manpages/locale.1 +=================================================================== +--- manpages/locale.1.orig ++++ manpages/locale.1 +@@ -247,17 +247,6 @@ This environment variable can switch aga + \& The directory where locale data is stored. By default, /usr/lib/locale is used. + .Ve + +-.SH "FILES" +-.IX Header "FILES" +-.PP +-.PD 0 +-.TP 8 +-\fI/usr/share/i18n/SUPPORTED\fP +-List of supported values (and their associated encoding) for the locale name. +-This representation is recommended over +-\fB\-\-all\-locales\fR one, due being the system wide supported values. +-.PP +- + .SH "AUTHOR" + .IX Header "AUTHOR" + \&\fIlocale\fR was written by Ulrich Drepper for the \s-1GNU\s0 C Library. +Index: manpages/locale.alias.5 +=================================================================== +--- manpages/locale.alias.5.orig ++++ manpages/locale.alias.5 +@@ -18,7 +18,7 @@ + .SH "NAME" + locale.alias \- Locale name alias data base + .SH "DESCRIPTION" +-The locale.alias database file (/etc/locale.alias) is used by the ++The locale.alias database file (/usr/share/locale/locale.alias) is used by the + .B locale + command and the + .B X Window System +@@ -40,6 +40,6 @@ name, or simpler versions of the POSIX l + Lines beginning with Hash ("#") are treated as comments and ignored. + + .SH "SEE ALSO" +-locale(1), localedef(1), locale-gen(8), locale.gen(5) ++locale(1), localedef(1) + .SH "AUTHOR" + Alastair McKinstry