rpms/HamFax/devel HamFax-0.6.4-configure.patch, NONE, 1.1 HamFax.spec, 1.1, 1.2 import.log, 1.1, 1.2

Randy Berry dp67 at fedoraproject.org
Sat Oct 18 05:07:47 UTC 2008


Author: dp67

Update of /cvs/pkgs/rpms/HamFax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4682/devel

Modified Files:
	HamFax.spec import.log 
Added Files:
	HamFax-0.6.4-configure.patch 
Log Message:

Added pacth for x86_64 builds


HamFax-0.6.4-configure.patch:

--- NEW FILE HamFax-0.6.4-configure.patch ---
diff -up HamFax-0.6.4/configure.orig HamFax-0.6.4/configure
--- HamFax-0.6.4/configure.orig	2004-10-12 15:38:28.000000000 -0400
+++ HamFax-0.6.4/configure	2008-10-17 23:50:27.000000000 -0400
@@ -4539,6 +4539,7 @@ else
       /usr/include
       `ls -dr /usr/include/qt* 2>/dev/null`
       `ls -dr /usr/lib/qt*/include 2>/dev/null`
+      `ls -dr /usr/lib64/qt*/include 2>/dev/null`
       `ls -dr /usr/local/qt*/include 2>/dev/null`
       `ls -dr /opt/qt*/include 2>/dev/null`
     "
@@ -4754,10 +4755,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
             bnv_dir_list="
               `echo $bnv_qt_includes | sed ss/includess`
               /lib
+              /lib64
               /usr/lib
+              /usr/lib64
               /usr/local/lib
               /opt/lib
               `ls -dr /usr/lib/qt* 2>/dev/null`
+              `ls -dr /usr/lib64/qt* 2>/dev/null`
               `ls -dr /usr/local/qt* 2>/dev/null`
               `ls -dr /opt/qt* 2>/dev/null`
             "


Index: HamFax.spec
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/devel/HamFax.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HamFax.spec	15 Oct 2008 23:06:17 -0000	1.1
+++ HamFax.spec	18 Oct 2008 05:07:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           HamFax
 Version:        0.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HamFax is an application for sending and receiving facsimiles in amateur radio      
 
 Group:          Applications/Communications  
@@ -9,6 +9,7 @@
 Source0:        http://downloads.sourceforge.net/hamfax/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.png
+Patch0:         %{name}-%{version}-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   audiofile-devel qt-devel qt3-devel libXmu-devel libX11-devel desktop-file-utils
@@ -24,7 +25,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b %{name}-%{vesrion}-configure.patch
 
 %build
 %configure
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Sat Oct 18 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-3
+- Add patch to allow build on x86_64
+
 * Tue Oct 14 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-2
 - Edit spec per review
 - rpmlint    = pass


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2008 23:06:17 -0000	1.1
+++ import.log	18 Oct 2008 05:07:17 -0000	1.2
@@ -1 +1,2 @@
 HamFax-0_6_4-2_fc9:HEAD:HamFax-0.6.4-2.fc9.src.rpm:1224111818
+HamFax-0_6_4-3_fc9:HEAD:HamFax-0.6.4-3.fc9.src.rpm:1224306331




More information about the scm-commits mailing list