[twlog] Rebuild for F14/Rawhide
Randall 'Randy' Berry
dp67 at fedoraproject.org
Sat Jul 31 01:39:54 UTC 2010
commit ea8b0cf6a1203ed6631b3dad501642d5c7949d77
Author: Randall J. Berry <rberry at kb3bjf.ham-radio-op.net>
Date: Fri Jul 30 21:38:28 2010 -0400
Rebuild for F14/Rawhide
twlog-2.7.configure.patch | 37 ++++++++++++++++++++++++++++++++++---
twlog-2.7.makefiles.patch | 20 ++++++++++++++++++++
twlog.spec | 5 ++++-
3 files changed, 58 insertions(+), 4 deletions(-)
---
diff --git a/twlog-2.7.configure.patch b/twlog-2.7.configure.patch
index b3eedac..696a4c6 100644
--- a/twlog-2.7.configure.patch
+++ b/twlog-2.7.configure.patch
@@ -1,7 +1,33 @@
diff -up ./configure.diff ./configure
--- ./configure.diff 2010-06-19 15:16:52.000000000 -0400
-+++ ./configure 2010-07-19 17:23:50.698318130 -0400
-@@ -5805,7 +5805,9 @@ then
++++ ./configure 2010-07-30 20:08:25.821309670 -0400
+@@ -5386,7 +5386,7 @@ else
+ # /usr/lesstif is used on Linux (Lesstif).
+ # /usr/openwin is used on Solaris (X and Athena).
+ # Other directories are just guesses.
+-for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
++for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/lib64 /usr/local/lib \
+ /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \
+ /usr/lib/X11 /usr/lib/X11R6 /usr/lib/X11R5 \
+ /usr/X11/lib /usr/X11R6/lib /usr/X11R5/lib \
+@@ -5684,11 +5684,14 @@ else
+ # Locate it and put its directory in `xbae_libraries'
+ #
+ # Other directories are just guesses.
+- for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
+- /usr/lib/Xbae \
++ for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/lib64 /usr/local/lib \
++ /usr/lib/Xbae /usr/lib64/Xbae \
+ /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \
++ /usr/lib64/X11R6 /usr/lib64/X11R5 /usr/lib64/X11R4 /usr/lib64/X11 \
+ /usr/dt/lib /usr/openwin/lib \
+ /usr/dt/*/lib /opt/*/lib /usr/lib/Xbae* \
++ /usr/dt/lib /usr/openwin/lib \
++ /usr/dt/*/lib64 /opt/*/lib64 /usr/lib64/Xbae* \
+ /usr/lesstif*/lib /usr/lib/Lesstif* \
+ "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
+ "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* \
+@@ -5805,9 +5808,13 @@ then
tw_save_LDFLAGS="$LDFLAGS"
for i in \
/usr/lib \
@@ -9,5 +35,10 @@ diff -up ./configure.diff ./configure
/usr/lib/X11 \
+ /usr/lib64/X11 \
/usr/X11R6/lib \
- /usr/X11/lib
+- /usr/X11/lib
++ /usr/X11/lib \
++ /usr/X11R6/lib64 \
++ /usr/X11/lib64
do
+ LDFLAGS="$tw_save_LDFLAGS -L$i"
+ as_ac_File=`$as_echo "ac_cv_file_$i/libXpm.so" | $as_tr_sh`
diff --git a/twlog-2.7.makefiles.patch b/twlog-2.7.makefiles.patch
index bdf3e38..b41529d 100644
--- a/twlog-2.7.makefiles.patch
+++ b/twlog-2.7.makefiles.patch
@@ -1,3 +1,23 @@
+diff -up ./configure.ac.orig ./configure.ac
+--- ./configure.ac.orig 2010-06-19 15:16:19.000000000 -0400
++++ ./configure.ac 2010-07-30 20:00:01.406309130 -0400
+@@ -67,10 +67,15 @@ then
+ tw_save_LDFLAGS="$LDFLAGS"
+ for i in \
+ /usr/lib \
++ /usr/lib64 \
+ /usr/lib/X11 \
++ /usr/lib64/X11 \
+ /usr/X11R6/lib \
+- /usr/X11/lib
++ /usr/X11R6/lib64 \
++ /usr/X11/lib \
++ /usr/X11/lib64
+ do
++
+ LDFLAGS="$tw_save_LDFLAGS -L$i"
+ AC_CHECK_FILE([$i/libXpm.so],
+ [AC_CHECK_LIB([Xpm], [XpmCreatePixmapFromData])
diff -up ./Makefile.am.orig ./Makefile.am
--- ./Makefile.am.orig 2008-02-01 00:58:06.000000000 -0500
+++ ./Makefile.am 2010-07-17 15:55:51.848322673 -0400
diff --git a/twlog.spec b/twlog.spec
index 9f0246f..576d315 100644
--- a/twlog.spec
+++ b/twlog.spec
@@ -1,6 +1,6 @@
Name: twlog
Version: 2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Records basic ham radio log information
Group: Applications/Communications
License: GPLv2+
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/%{name}.desktop
%changelog
+* Fri Jul 30 2010 Randall "Randy" Berry, N3LRX <dp67 at fedoraprojecct.org> - 2.7-3
+- Rebuild for F14/Rawhide
+
* Mon Jul 19 2010 Randall "Randy" Berry, N3LRX <dp67 at fedoraprojecct.org> - 2.7-2
- Apply configure patch to search proper library directories on x86_64
More information about the scm-commits
mailing list