Browse Source

screen: update to 4.6.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11619 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 6 years ago
parent
commit
6796ccf7e8
1 changed files with 27 additions and 22 deletions
  1. 27 22
      s/screen/screen-vl.spec

+ 27 - 22
s/screen/screen-vl.spec

@@ -1,21 +1,23 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Summary(ja): スクリーンマネージャ - 一つの端末で多重ログイン
 Name: screen
-Version: 4.0.3
-Release: 4%{?_dist_release}
-License: GPL
+Version: 4.6.2
+Release: 1%{?_dist_release}
+License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
-# based http://git.savannah.gnu.org/gitweb/?p=screen.git;a=commit;h=97059b7ad521cf796daee07397c658d9716dd1e7
-Patch0: screen-4.0.3-execvpe.patch
-Patch6: screen-3.9.8-hascrypt.patch
-Patch11: screen-3.9.11-utf8-install.patch
-# obtained Patch11 from redhat
-Patch12: screen-4.0.3-stropts.patch
+Source1:        screen.pam
+
+Patch1:         screen-4.3.1-libs.patch
+Patch2:         screen-4.3.1-screenrc.patch
+Patch3:         screen-E3.patch
+Patch4:         screen-4.3.1-suppress_remap.patch
+Patch5:         screen-4.3.1-crypt.patch
 
 Requires: ncurses
 Requires(post,preun): /sbin/install-info
 BuildRequires: ncurses-devel, texinfo, perl
+BuildRequires: pam-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
@@ -40,19 +42,9 @@ support multiple logins on one terminal.
 
 %prep
 %setup -q
-%patch0 -p1 -b .execvpe
-
-# avoid duplicated type declaration of crypt.
-%patch6 -p1 -b .hascrypt
-
-# to make directories under $RPM_BUILD_ROOT
-%patch11 -p1 -b .utf8
-
-# do not include <sys/stropts.h>
-%patch12 -p1 -b .stropts
+%autosetup -p1
 
 %build
-
 autoconf
 
 %configure \
@@ -70,8 +62,9 @@ perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h
 
 perl -pi -e 's|/usr/local/etc/screenrc|/etc/screenrc|' etc/etcscreenrc doc/*
 perl -pi -e 's|/local/etc/screenrc|/etc/screenrc|' doc/*
-rm doc/screen.info*
+rm -f doc/screen.info*
 
+# fails with %{?_smp_mflags}
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
 %install
@@ -93,6 +86,12 @@ perl -pi -e 's,/usr/local/etc/screenrc,/etc/screenrc,' etc/etcscreenrc
 install -c -m 0444 etc/etcscreenrc $RPM_BUILD_ROOT/etc/screenrc
 install -c -m 0644 etc/screenrc $RPM_BUILD_ROOT/etc/skel/.screenrc
 
+# Better not forget to copy the pam file around
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/screen
+# Remove files from the buildroot which we don't want packaged
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,11 +116,17 @@ fi
 %{_mandir}/man1/screen.*
 %{_infodir}/screen.info*
 %{_datadir}/screen
-%config(noreplace) /etc/screenrc
+%config(noreplace) %{_sysconfdir}/screenrc
+%config(noreplace) %{_sysconfdir}/pam.d/screen
 %config /etc/skel/.screenrc
 
 
 %changelog
+* Fri Apr 20 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.6.2-1
+- update to 4.6.2
+- change License
+- sync fc28 package
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.0.3-4
 - rebuild with VineSeed environment