From addc6e6a19667f3f12c75564a9a4c57259b2b4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 6 Feb 2007 12:10:20 +0000 Subject: [PATCH] Change for review. --- screen-4.0.3-perm.patch | 11 +++++++++++ screen.spec | 30 +++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 screen-4.0.3-perm.patch diff --git a/screen-4.0.3-perm.patch b/screen-4.0.3-perm.patch new file mode 100644 index 0000000..b4fc1e0 --- /dev/null +++ b/screen-4.0.3-perm.patch @@ -0,0 +1,11 @@ +--- screen-4.0.3/Makefile.in.perm 2007-02-06 10:25:58.000000000 +0100 ++++ screen-4.0.3/Makefile.in 2007-02-06 10:26:10.000000000 +0100 +@@ -74,7 +74,7 @@ + -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ + then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi + $(INSTALL) -m 755 screen $(DESTDIR)$(bindir)/$(SCREEN) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) ++ -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 755 $(DESTDIR)$(bindir)/$(SCREEN) + # This doesn't work if $(bindir)/screen is a symlink + -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi + rm -f $(DESTDIR)$(bindir)/screen diff --git a/screen.spec b/screen.spec index 0bf6894..39bb2ac 100644 --- a/screen.spec +++ b/screen.spec @@ -1,8 +1,8 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.0.3 -Release: 2%{?dist} -License: GPL2 +Release: 3%{?dist} +License: GPL Group: Applications/System URL: http://www.gnu.org/software/screen Requires(pre): /usr/sbin/groupadd @@ -28,7 +28,7 @@ Patch1: screen-3.9.13-ia64.patch # it to suit their personal preferances # Patch2: screen-4.0.2-screenrc.patch -Patch3: screen-4.0.1-etcscreenrc.patch +#Patch3: screen-4.0.1-etcscreenrc.patch # Due to the way the build system creates rpms in a buildroot # we need this tweak for utf8encodings @@ -45,18 +45,19 @@ Patch5: screen-3.9.11-no-stripping-or-elf.patch # patch is not applied for now. We'll include it in the srpm # in case someone else wants it. # -Patch6: screen-3.9.15-home-screendir.patch +#Patch6: screen-3.9.15-home-screendir.patch # Fixes potential buffer overflow when > 2^31 semicolons are passed. # Patch7: screen-4.0.1-args.patch -Patch8: screen-4.0.2-logname.patch +#Patch8: screen-4.0.2-logname.patch # reassign lockscreen to ^aX so its harder to hit by accident Patch9: screen-4.0.2-lock-shortcut.patch Patch10: screen-4.0.2-lib64.patch Patch11: screen-4.0.2-maxstr.patch Patch12: screen-4.0.3-ipv6.patch +Patch13: screen-4.0.3-perm.patch %description The screen utility allows you to have multiple logins on just one @@ -91,6 +92,7 @@ support multiple logins on one terminal. %patch10 -p1 -b .lib64 %patch11 -p1 -b .maxstr %patch12 -p1 -b .ipv6 +%patch13 -p1 -b .perm %build libtoolize --copy --force @@ -162,28 +164,30 @@ rm -rf $RPM_BUILD_ROOT /usr/sbin/groupadd -g 84 -r -f screen %post -/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: - +/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." ||: + /sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: fi %files %defattr(-,root,root) -%doc NEWS README doc/FAQ doc/README.DOTSCREEN +%doc NEWS README doc/FAQ doc/README.DOTSCREEN COPYING -%attr(2755,root,screen) %{_bindir}/screen +%attr(0755,root,screen) %{_bindir}/screen %{_mandir}/man1/screen.* %{_infodir}/screen.info* %{_datadir}/screen -%attr(775,root,screen) %{_localstatedir}/run/screen +%attr(0755,root,screen) %{_localstatedir}/run/screen %config(noreplace) /etc/screenrc %config(noreplace) /etc/pam.d/screen %changelog +* Tue Feb 6 2007 Marcela Maslanova - 4.0.3-3 +- rebuilt (change in spec file) + * Fri Jan 5 2007 Marcela Maslanova - 4.0.3-2 - rebuilt (change in spec file) @@ -446,13 +450,13 @@ for build 2. * Sat May 6 2000 Bill Nottingham - fix build for ia64 -* Mon Apr 3 2000 Bernhard Rosenkränzer +* Mon Apr 3 2000 Bernhard Rosenkränzer - rebuild with new ncurses * Tue Mar 7 2000 Jeff Johnson - rebuild for sparc baud rates > 38400. -* Tue Feb 15 2000 Bernhard Rosenkränzer +* Tue Feb 15 2000 Bernhard Rosenkränzer - Fix MD5 password support (Bug #9463) * Thu Feb 3 2000 Bill Nottingham