diff -N -a -B -b -U 3 screen.spec.old/screen.spec screen.spec.new/screen.spec --- screen.spec.old/screen.spec 2008-06-10 10:01:09.000000000 -0400 +++ screen.spec.new/screen.spec 2008-06-10 09:57:49.000000000 -0400 @@ -43,6 +43,9 @@ Juergen Weigert Michael Schroeder +%if %{!?MAXWIN:1}0 +%define MAXWIN 40 +%endif %prep %setup %patch @@ -52,37 +55,50 @@ %patch4 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --infodir=%{_infodir} \ +CFLAGS="$RPM_OPT_FLAGS" ./configure \ + --prefix=%{_prefix} \ + --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \ - --with-sys-screenrc=/etc/screenrc \ - --with-pty-group=5 \ + --with-socket-dir='(eff_uid ? "%{_var}/run/uscreens" : "%{_var}/run/screens")' \ +%if %{!?NO_SYS_SCREENRC:1}0 + --with-sys-screenrc=%{_sysconfdir}/screenrc \ +%endif +%if %{!?NO_ENABLE_LOCALE:1}0 --enable-locale \ +%endif +%if %{!?NO_ENABLE_TELNET:1}0 --enable-telnet \ +%endif + --with-pty-group=5 \ + --with-maxwin=%{MAXWIN} \ --enable-colors256 \ --verbose make %install -make install DESTDIR=$RPM_BUILD_ROOT -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 -mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/var/run/screens -chmod 755 $RPM_BUILD_ROOT/var/run/screens -mkdir -p $RPM_BUILD_ROOT/var/run/uscreens -chmod 1777 $RPM_BUILD_ROOT/var/run/uscreens -install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc +make install DESTDIR=${RPM_BUILD_ROOT} +rm -f ${RPM_BUILD_ROOT}/%{_bindir}/screen +mv ${RPM_BUILD_ROOT}/%{_bindir}/screen-%version ${RPM_BUILD_ROOT}/%{_bindir}/screen +chmod 755 ${RPM_BUILD_ROOT}/%{_bindir}/screen +mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir} +mkdir -p ${RPM_BUILD_ROOT}/%{_var}/run/screens +chmod 755 ${RPM_BUILD_ROOT}/%{_var}/run/screens +mkdir -p ${RPM_BUILD_ROOT}/%{_var}/run/uscreens +chmod 1777 ${RPM_BUILD_ROOT}/%{_var}/run/uscreens +%if %{!?NO_SYS_SCREENRC:1}0 +install -m 644 screenrc ${RPM_BUILD_ROOT}/%{_sysconfdir}/screenrc +%endif %files %defattr(-,root,root) -%config /etc/screenrc -%attr(555,root,root) /usr/bin/screen -%dir /usr/share/screen -/usr/share/screen/utf8encodings -%dir /var/run/screens -%dir /var/run/uscreens +%if %{!?NO_SYS_SCREENRC:1}0 +%config %{_sysconfdir}/screenrc +%endif +%attr(555,root,root) %{_bindir}/screen +%dir %{_datadir}/screen +%{_datadir}/screen/utf8encodings +%dir %{_var}/run/screens +%dir %{_var}/run/uscreens %doc %{_infodir}/screen.info*.gz %doc %{_mandir}/man1/screen.1.gz