testing/screen
SHA256
3
0
Fork 0
forked from pool/screen
Code Pull Requests Activity

Accepting request 137554 from home:lnt-sysadmin:branches:Base:System

Browse Source 
The currently used "--enable-locale" is not correct, it should be "--enable-use-locale" instead, as the configure code is testing: 
-------- 
if test "$enable_use_locale" = "yes"; then 
... 
-------- 
Hence, using "--enable-locale" will result in a warning about an unknown option.

Changelog updated and bug reported upstream here: https://savannah.gnu.org/bugs/index.php?37528

OBS-URL: https://build.opensuse.org/request/show/137554
OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=37
This commit is contained in:
Ismail Dönmez 2012-10-09 13:15:30 +00:00 committed by Git OBS Bridge
parent f516d617e1
commit 603a97f8a3
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
screen.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 9 07:47:52 UTC 2012 - lnt-sysadmin@lists.lrz.de
- add use_locale.diff to fix --enable-use-locale configure option
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 13 13:52:04 CEST 2012 - mls@suse.de Thu Sep 13 13:52:04 CEST 2012 - mls@suse.de

5
screen.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Url: http://www.gnu.org/software/screen/ Url: http://www.gnu.org/software/screen/
Name: screen Name: screen
@ -44,6 +45,7 @@ Patch5: sort_command.patch
Patch6: libtinfo.diff Patch6: libtinfo.diff
Patch7: mappedcmd.diff Patch7: mappedcmd.diff
Patch8: styroptcrash.diff Patch8: styroptcrash.diff
Patch9: use_locale.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -64,6 +66,7 @@ Documentation: man page
%patch6 %patch6
%patch7 -p2 %patch7 -p2
%patch8 -p2 %patch8 -p2
%patch9 -p1
%build %build
CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \
@ -71,7 +74,7 @@ CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_info
--with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \ --with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \
--with-sys-screenrc=/etc/screenrc \ --with-sys-screenrc=/etc/screenrc \
--with-pty-group=5 \ --with-pty-group=5 \
--enable-locale \ --enable-use-locale \
--enable-telnet \ --enable-telnet \
--enable-colors256 \ --enable-colors256 \
--verbose --verbose

24
use_locale.diff Normal file
View File

@ -0,0 +1,24 @@
diff -Pdpru a/configure b/configure
--- a/configure 2012-09-19 14:44:09.593017471 +0200
+++ b/configure 2012-09-19 15:20:44.406073384 +0200
@@ -1338,7 +1339,7 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-socket-dir disable system wide socket-dir and use ~/.screen instead
--enable-pam enable PAM support
- --enable-locale use localized month/day names
+ --enable-use-locale use localized month/day names
--enable-telnet enable builtin telnet
--enable-colors256 enable support for 256 colors
--enable-rxvt_osc enable support for rxvt OSC codes
diff -Pdpru a/configure.in b/configure.in
--- a/configure.in 2012-09-19 14:44:09.592017464 +0200
+++ b/configure.in 2012-09-19 15:21:45.555515336 +0200
@@ -1265,7 +1276,7 @@ if test "$enable_pam" = "yes"; then
AC_MSG_RESULT(no);LIBS="$oldlibs")
fi
-AC_ARG_ENABLE(use_locale, [ --enable-locale use localized month/day names])
+AC_ARG_ENABLE(use_locale, [ --enable-use-locale use localized month/day names])
if test "$enable_use_locale" = "yes"; then
AC_DEFINE(USE_LOCALE)
fi