I have made the following changes intended for : CE:Utils / screen Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/4453 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4453: Messages from BOSS: State: review at 2012-03-05T17:25:36 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Utils / screen -> CE:Utils / screen changes files: -------------- --- screen.changes +++ screen.changes @@ -0,0 +1,4 @@ +* Mon Mar 05 2012 Marko Saukko <[email protected]> - 4.0.3 +- Added .yaml for spectacle +- Added -docs subpackage to fix part of MER#197. + new: ---- screen.yaml spec files: ----------- --- screen.spec +++ screen.spec @@ -1,31 +1,34 @@ -#specfile originally created for Fedora, modified for Moblin Linux -Summary: A screen manager that supports multiple logins on one terminal +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +# << macros + Name: screen +Summary: A screen manager that supports multiple logins on one terminal Version: 4.0.3 Release: 12 -License: GPLv2+ Group: Applications/System +License: GPLv2+ URL: http://www.gnu.org/software/screen -Requires(pre): /usr/sbin/groupadd -Requires(preun): /sbin/install-info -Requires(post): /sbin/install-info -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel pam-devel libutempter-devel autoconf texinfo - -# The one and only true source Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz -# Except for the PAM configuration, that is. Source1: screen.pam +Source100: screen.yaml +Patch0: screen-4.0.3-libs.patch +Patch1: screen-4.0.2-screenrc.patch +Patch2: screen-4.0.3-stropts.patch +Patch3: screen-4.0.1-args.patch +Patch4: screen-4.0.2-maxstr.patch +Patch5: screen-4.0.3-ipv6.patch +Patch6: screen-CVE-2009-1214,1215.patch +Requires(pre): /usr/sbin/groupadd +BuildRequires: pkgconfig(ncurses) +BuildRequires: pam-devel +BuildRequires: libutempter-devel +BuildRequires: autoconf +BuildRequires: texinfo -Patch1: screen-4.0.3-libs.patch -# Some tweaks of the default screenrc -Patch2: screen-4.0.2-screenrc.patch -Patch4: screen-4.0.3-stropts.patch -# Fixes potential buffer overflow when > 2^31 semicolons are passed. -Patch7: screen-4.0.1-args.patch -Patch11: screen-4.0.2-maxstr.patch -Patch12: screen-4.0.3-ipv6.patch -Patch13: screen-CVE-2009-1214,1215.patch %description The screen utility allows you to have multiple logins on just one @@ -37,29 +40,58 @@ support multiple logins on one terminal. + +%package docs +Summary: Documentation files for %{name} +Group: Application/System +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + +%description docs +%{summary}. + + + %prep -%setup -q -%patch1 -p1 -b .libs -%patch2 -p1 -b .screenrc -%patch4 -p1 -b .stropts -%patch7 -p0 -b .args -%patch11 -p1 -b .maxstr -%patch12 -p1 -b .ipv6 -%patch13 -p1 -b .CVE-2009-1214,1215 +%setup -q -n %{name}-%{version} + +# screen-4.0.3-libs.patch +%patch0 -p1 +# screen-4.0.2-screenrc.patch +%patch1 -p1 +# screen-4.0.3-stropts.patch +%patch2 -p1 +# screen-4.0.1-args.patch +%patch3 -p1 +# screen-4.0.2-maxstr.patch +%patch4 -p1 +# screen-4.0.3-ipv6.patch +%patch5 -p1 +# screen-CVE-2009-1214,1215.patch +%patch6 -p1 +# >> setup +# << setup %build +# >> build pre +# << build pre + + + +# >> build post autoconf %configure \ - --enable-pam \ - --enable-colors256 \ - --enable-rxvt_osc \ - --enable-locale \ - --enable-telnet \ - --with-pty-mode=0620 \ - --with-pty-group=$(getent group tty | cut -d : -f 3) \ - --with-sys-screenrc="%{_sysconfdir}/screenrc" \ - --with-socket-dir="%{_localstatedir}/run/screen" +--enable-pam \ +--enable-colors256 \ +--enable-rxvt_osc \ +--enable-locale \ +--enable-telnet \ +--with-pty-mode=0620 \ +--with-pty-group=$(getent group tty | cut -d : -f 3) \ +--with-sys-screenrc="%{_sysconfdir}/screenrc" \ +--with-socket-dir="%{_localstatedir}/run/screen" # We would like to have braille support. sed -i -e 's/.*#.*undef.*HAVE_BRAILLE.*/#define HAVE_BRAILLE 1/;' config.h @@ -68,10 +100,13 @@ rm doc/screen.info* make %{?_smp_mflags} - +# << build post %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} +# >> install pre +# << install pre +# >> install post make install DESTDIR=$RPM_BUILD_ROOT mv -f $RPM_BUILD_ROOT%{_bindir}/screen{-%{version},} @@ -88,30 +123,44 @@ # Remove files from the buildroot which we don't want packaged rm -f $RPM_BUILD_ROOT%{_infodir}/dir - -%clean -rm -rf $RPM_BUILD_ROOT +# << install post %pre +# >> pre /usr/sbin/groupadd -g 84 -r -f screen : +# << pre + + + + -%post -/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: +%post docs +%install_info --info-dir=%_infodir %{_infodir}/screen.info.gz + +%postun docs +if [ $1 = 0 ] ;then +%install_info_delete --info-dir=%{_infodir} %{_infodir}/screen.info.gz fi %files %defattr(-,root,root,-) -%doc NEWS README doc/FAQ doc/README.DOTSCREEN COPYING +# >> files +%doc COPYING %attr(2755,root,screen) %{_bindir}/screen -%doc %{_mandir}/man1/screen.* -%doc %{_infodir}/screen.info* %{_datadir}/screen %attr(775,root,screen) %{_localstatedir}/run/screen %config(noreplace) %{_sysconfdir}/screenrc %config(noreplace) %{_sysconfdir}/pam.d/screen +# << files + + +%files docs +%defattr(-,root,root,-) +# >> files docs +%doc NEWS README doc/FAQ doc/README.DOTSCREEN COPYING +%doc %{_mandir}/man1/screen.* +%doc %{_infodir}/screen.info.gz +# << files docs other changes: -------------- ++++++ screen-4.0.1-args.patch --- screen-4.0.1-args.patch +++ screen-4.0.1-args.patch @@ -1,5 +1,5 @@ ---- ansi.c.orig 2003-12-04 10:59:05.000000000 -0500 -+++ ansi.c 2003-12-04 10:59:20.000000000 -0500 +--- a/ansi.c.orig 2003-12-04 10:59:05.000000000 -0500 ++++ b/ansi.c 2003-12-04 10:59:20.000000000 -0500 @@ -559,7 +559,7 @@ { case '0': case '1': case '2': case '3': case '4': @@ -9,8 +9,8 @@ { if (curr->w_args[curr->w_NumArgs] < 100000000) curr->w_args[curr->w_NumArgs] = ---- resize.c.old 2003-11-27 02:55:07.000000000 +0200 -+++ resize.c 2003-11-27 02:58:33.000000000 +0200 +--- a/resize.c.old 2003-11-27 02:55:07.000000000 +0200 ++++ b/resize.c 2003-11-27 02:58:33.000000000 +0200 @@ -682,6 +682,17 @@ if (wi == 0) he = hi = 0; ++++++ screen.yaml (new) --- screen.yaml +++ screen.yaml @@ -0,0 +1,45 @@ +Name: screen +Summary: A screen manager that supports multiple logins on one terminal +Version: 4.0.3 +Release: 12 +Group: Applications/System +License: GPLv2+ +URL: http://www.gnu.org/software/screen +Sources: + - ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz + - screen.pam +Patches: + - screen-4.0.3-libs.patch + - screen-4.0.2-screenrc.patch + - screen-4.0.3-stropts.patch + - screen-4.0.1-args.patch + - screen-4.0.2-maxstr.patch + - screen-4.0.3-ipv6.patch + - screen-CVE-2009-1214,1215.patch +Description: | + The screen utility allows you to have multiple logins on just one + terminal. Screen is useful for users who telnet into a machine or are + connected via a dumb terminal, but want to use more than just one + login. + + Install the screen package if you need a screen manager that can + support multiple logins on one terminal. + +RequiresPre: + - /usr/sbin/groupadd +PkgConfigBR: + - ncurses +PkgBR: + - pam-devel + - libutempter-devel + - autoconf + - texinfo +Configure: none +Builder: none + +SubPackages: + - Name: docs + Summary: Documentation files for %{name} + Group: Application/System + Description: | + %{summary}.
