Bump to version 4.2.0tizen_4.0.m1_releasetizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_wearable/20150127.000002submit/tizen_unified/20170308.100416submit/tizen_tv/20150323.000000submit/tizen_tv/20150320.000000submit/tizen_tv/20150130.050505submit/tizen_mobile/20150128.000000submit/tizen_ivi/20160217.000007submit/tizen_ivi/20160217.000000submit/tizen_ivi/20150108.333333submit/tizen_ivi/20150108.222222submit/tizen_ivi/20150108.111111submit/tizen_common/20150106.084216submit/tizen_4.0/20170828.100007submit/tizen_4.0/20170811.094300submit/tizen_3.0_ivi/20161010.000006submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093754accepted/tizen/wearable/20150129.005544accepted/tizen/unified/20170309.040435accepted/tizen/tv/20150324.014632accepted/tizen/mobile/20150129.040542accepted/tizen/ivi/20160218.025827accepted/tizen/ivi/20150113.060259accepted/tizen/common/20150106.140023accepted/tizen/4.0/unified/20170828.221744accepted/tizen/4.0/unified/20170816.012642accepted/tizen/3.0/ivi/20161011.062312accepted/tizen/3.0/common/20161114.111740tizen_4.0tizen_3.0_ivitizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0sandbox/pcoval/tizen_2.4sandbox/kevinthierry/bump-4.2.0accepted/tizen_wearableaccepted/tizen_unifiedaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_4.0_unifiedaccepted/tizen_3.0_iviaccepted/tizen_3.0_common

Bug-Tizen: TC-2059
Change-Id: Idf8f480c1ff5e9e166e342f55fd6763d80ab87a0
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

1 files changed, 20 insertions, 20 deletions

diff --git a/packaging/screen.spec b/packaging/screen.spec
index 582e354..021d781 100644
--- a/packaging/screen.spec
+++ b/packaging/screen.spec
@@ -18,15 +18,15 @@ Name:           screen
 BuildRequires:  makeinfo
 BuildRequires:  ncurses-devel
 BuildRequires:  utempter-devel
-Requires(pre):         coreutils
-Version:        4.0.4
+Requires(pre):  coreutils
+Version:        4.2.0
 Release:        0
 Summary:        A program to allow multiple screens on a VT100/ANSI Terminal
-License:        GPL-2.0+
-Group:          System/Console
+License:        GPL-3.0
+Group:          System/Utilities
 Source:         %{name}-%{version}.tar.gz
 Source1:        screen.conf
-Source1001: 	screen.manifest
+Source1001:     screen.manifest
 
 %description
 With this program you can take advantage of the multitasking abilities
@@ -38,19 +38,20 @@ Documentation: man page
 %prep
 %setup
 cp %{SOURCE1001} .
+
 %build
-CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \
-				--mandir=%{_mandir} \
-				--with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \
-				--with-sys-screenrc=/etc/screenrc \
-				--with-pty-group=5 \
-				--enable-use-locale \
-				--enable-colors256 \
-				--verbose
-make %{?_smp_mflags}
+CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %reconfigure --prefix=/usr --infodir=%{_infodir} \
+                --mandir=%{_mandir} \
+                --with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \
+                --with-sys-screenrc=/etc/screenrc \
+                --with-pty-group=5 \
+                --enable-use-locale \
+                --enable-colors256 \
+                --verbose
+%__make -j1
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 rm -f $RPM_BUILD_ROOT/usr/bin/screen
 mv $RPM_BUILD_ROOT/usr/bin/screen-%version $RPM_BUILD_ROOT/usr/bin/screen
 chmod 755 $RPM_BUILD_ROOT/usr/bin/screen
@@ -75,15 +76,14 @@ test -d /var/run/uscreens || mkdir -m 1777 /var/run/uscreens
 %manifest %{name}.manifest
 %license COPYING
 %defattr(-,root,root)
-%config /etc/screenrc
-%attr(555,root,root) /usr/bin/screen
+%config %{_sysconfdir}/screenrc
+%attr(555,root,root) %{_bindir}/screen
 %dir /usr/share/screen
 %dir /usr/lib/tmpfiles.d
-/usr/lib/tmpfiles.d/screen.conf
-/usr/share/screen/utf8encodings
+/%{_prefix}/lib/tmpfiles.d/screen.conf
+%{_datadir}/%{name}/utf8encodings
 # Created via aaa_base or systemd on system boot
 %ghost %dir /var/run/screens
 %ghost %dir /var/run/uscreens
 %doc %{_infodir}/screen.info*.gz
 %doc %{_mandir}/man1/screen.1.gz
-