rpms/screen/devel screen.spec,1.32,1.33
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 16 04:36:40 UTC 2006
- Previous message (by thread): rpms/kernel/devel/configs config-generic,1.242,1.243
- Next message (by thread): rpms/openais/devel .cvsignore, 1.6, 1.7 openais.spec, 1.11, 1.12 sources, 1.6, 1.7 cpg-hash-collision.patch, 1.1, NONE makefile-install-clm.patch, 1.1, NONE revision-1173.patch, 1.1, NONE revision-1179.patch, 1.1, NONE revision-1180.patch, 1.1, NONE revision-1181.patch, 1.1, NONE revision-1182.patch, 1.1, NONE revision-1183.patch, 1.1, NONE revision-1184.patch, 1.1, NONE revision-1185.patch, 1.1, NONE revision-1186.patch, 1.1, NONE revision-1187.patch, 1.1, NONE revision-1188.patch, 1.1, NONE revision-1189.patch, 1.1, NONE revision-1190.patch, 1.1, NONE revision-1191.patch, 1.1, NONE revision-1192.patch, 1.1, NONE revision-1193.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jkeating
Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15921
Modified Files:
screen.spec
Log Message:
- Don't use %makeinstall, instead make install.
- Change DDESTDIR to DESTDIR to do the right thing.
- Comment out utf patch as it is no longer necessary.
- Add dist tag
- Change PreReq to correct Requires(pre), Requires(post), Requires(preun)
- Don't use RPM_SOURCE_DIR, reference the source file directly
- Do the compiling (make) in %build, not %install
- Don't replace /etc/screenrc if the user has modified it
- Ditto /etc/pam.d/screen
- Change the buildroot to follow guidelines
Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- screen.spec 13 Jul 2006 18:42:06 -0000 1.32
+++ screen.spec 16 Aug 2006 04:36:34 -0000 1.33
@@ -1,12 +1,14 @@
Summary: A screen manager that supports multiple logins on one terminal
Name: screen
Version: 4.0.2
-Release: 15.1
+Release: 16%{?dist}
License: GPL2
Group: Applications/System
URL: http://www.gnu.org/software/screen
-Prereq: /sbin/install-info, /usr/sbin/groupadd
-BuildRoot: %{_tmppath}/%{name}-root
+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 texinfo pam-devel libtool
#
@@ -31,7 +33,8 @@
# Due to the way the build system creates rpms in a buildroot
# we need this tweak for utf8encodings
#
-Patch4: screen-3.9.11-utf8-install.patch
+# This is not needed anymore
+#Patch4: screen-3.9.11-utf8-install.patch
# We need to allow rpm to strip the binary and we don't have a
# libelf dependancy
@@ -54,6 +57,7 @@
Patch10: screen-4.0.2-lib64.patch
Patch11: screen-4.0.2-maxstr.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
@@ -71,7 +75,7 @@
%patch1 -p1 -b .ia64
%patch2 -p1 -b .screenrc
#%patch3 -p1 -b .etcscreenrc
-%patch4 -p1 -b .utf8-install
+#%patch4 -p1 -b .utf8-install
%patch5 -p1 -b .no-stripping-or-elf
#%patch8 -p1 -b .logname
@@ -122,13 +126,14 @@
make clean
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" make $BUILD_MAKE_FLAGS
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc
-%makeinstall DDESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
( cd $RPM_BUILD_ROOT
rm -f .%{_bindir}/screen.old .%{_bindir}/screen
@@ -141,7 +146,7 @@
# Better not forget to copy the pam file around
#
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 0644 $RPM_SOURCE_DIR/screen.pam $RPM_BUILD_ROOT/etc/pam.d/screen
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/screen
# Create the socket dir
mkdir -p $RPM_BUILD_ROOT/var/run/screen
@@ -175,10 +180,22 @@
%{_infodir}/screen.info*
%{_datadir}/screen
%attr(775,root,screen) %{_localstatedir}/run/screen
-%config /etc/screenrc
-%config /etc/pam.d/screen
+%config(noreplace) /etc/screenrc
+%config(noreplace) /etc/pam.d/screen
%changelog
+* Wed Aug 16 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-16
+- Don't use %%makeinstall, instead make install.
+- Change DDESTDIR to DESTDIR to do the right thing.
+- Comment out utf patch as it is no longer necessary.
+- Add dist tag
+- Change PreReq to correct Requires(pre), Requires(post), Requires(preun)
+- Don't use RPM_SOURCE_DIR, reference the source file directly
+- Do the compiling (make) in %%build, not %%install
+- Don't replace /etc/screenrc if the user has modified it
+- Ditto /etc/pam.d/screen
+- Change the buildroot to follow guidelines
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-15.1
- rebuild
- Previous message (by thread): rpms/kernel/devel/configs config-generic,1.242,1.243
- Next message (by thread): rpms/openais/devel .cvsignore, 1.6, 1.7 openais.spec, 1.11, 1.12 sources, 1.6, 1.7 cpg-hash-collision.patch, 1.1, NONE makefile-install-clm.patch, 1.1, NONE revision-1173.patch, 1.1, NONE revision-1179.patch, 1.1, NONE revision-1180.patch, 1.1, NONE revision-1181.patch, 1.1, NONE revision-1182.patch, 1.1, NONE revision-1183.patch, 1.1, NONE revision-1184.patch, 1.1, NONE revision-1185.patch, 1.1, NONE revision-1186.patch, 1.1, NONE revision-1187.patch, 1.1, NONE revision-1188.patch, 1.1, NONE revision-1189.patch, 1.1, NONE revision-1190.patch, 1.1, NONE revision-1191.patch, 1.1, NONE revision-1192.patch, 1.1, NONE revision-1193.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list