rpms/rxvt/devel rxvt-rpath.patch,NONE,1.1 rxvt.spec,1.12,1.13
Author: awjb
Update of /cvs/extras/rpms/rxvt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5916/devel
Modified Files:
rxvt.spec
Added Files:
rxvt-rpath.patch
Log Message:
- inspired by #177302 fix term name to rxvt for termcap
- get rid of rpath
fc{3,4} - add dist
rxvt-rpath.patch:
--- NEW FILE rxvt-rpath.patch ---
--- src/Makefile.in.orig 2006-02-28 23:33:12.000000000 +0100
+++ src/Makefile.in 2006-02-28 23:33:25.000000000 +0100
@@ -103,7 +103,7 @@
date >.protos
librxvt.la: $(LIBOBJS)
- $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS)
$(LIBS) -o $@
+ $(LIBTOOL) --mode=link $(LINK) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
#-------------------------------------------------------------------------
tags: $(SRCS) $(HDRS) $(EXTRAHDRS)
ctags $(SRCS) $(HDRS) $(EXTRAHDRS)
--- configure.orig 2006-02-28 23:54:05.000000000 +0100
+++ configure 2006-02-28 23:56:31.000000000 +0100
@@ -9753,12 +9753,11 @@
else
LDARG=""
fi
-R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
ac_save_CFLAGS=$CFLAGS
ac_save_LIBS=$LIBS
CFLAGS="$CFLAGS $X_CFLAGS"
-LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
+LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
echo "$as_me:$LINENO: checking for -rpath dynamic library path recording"
>&5
echo $ECHO_N "checking for -rpath dynamic library path recording... $ECHO_C"
>&6
if test "${rxvt_cv_rpath+set}" = set; then
@@ -9808,8 +9807,7 @@
echo "$as_me:$LINENO: result: $rxvt_cv_rpath" >&5
echo "${ECHO_T}$rxvt_cv_rpath" >&6
if test x$rxvt_cv_rpath != xyes; then
- R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
- LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed
"$R_TRANSLATE"`
+ LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
echo "$as_me:$LINENO: checking for -R dynamic library path recording"
>&5
echo $ECHO_N "checking for -R dynamic library path recording... $ECHO_C"
>&6
if test "${rxvt_cv_R+set}" = set; then
@@ -14214,9 +14212,6 @@
ac_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
-if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
- LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
-fi
echo "$as_me:$LINENO: checking for working Xlocale" >&5
echo $ECHO_N "checking for working Xlocale... $ECHO_C" >&6
if test "${rxvt_cv_func_xlocale+set}" = set; then
@@ -14822,18 +14817,6 @@
-if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
- DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
- LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
- X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
- X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
- XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
-fi
-
-
-
-
-
if test x$support_addstrings = xyes; then
OBJSTRINGS="strings.o"
else
Index: rxvt.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt/devel/rxvt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt.spec 16 Feb 2006 22:56:59 -0000 1.12
+++ rxvt.spec 28 Feb 2006 23:02:50 -0000 1.13
@@ -1,6 +1,6 @@
Name: rxvt
Version: 2.7.10
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: ouR XVT, a VT102 emulator for the X window system
Group: User Interface/X
@@ -9,6 +9,7 @@
Source0: http://dl.sourceforge.net/sourceforge/rxvt/%{name}-%{version}.tar.gz
Source1: rxvt.desktop
Source2: rclock.desktop
+Patch0: rxvt-rpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel
@@ -28,10 +29,11 @@
%prep
%setup -q
+%patch0
%build
%configure --enable-everything --enable-xgetdefault --enable-256-color \
- --x-includes=%{_includedir} --x-libraries=%{_libdir}
+ --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-term=rxvt
make %{?_smp_mflags}
@@ -67,6 +69,11 @@
%changelog
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.7.10-10
+- inspired by #177302 fix term name to rxvt for termcap
+- get rid of rpath
+
* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.7.10-9
- Rebuild for Fedora Extras 5