[UpTools/f14] Created srpm

sebelk sebelk at fedoraproject.org
Mon May 16 16:25:07 UTC 2011


commit 9682e5198c4642b9b89b1176b69b3139566aca31
Author: Sergio Belkin <sebelk at fedoraproject.org>
Date:   Mon May 16 13:24:28 2011 -0300

    Created srpm

 UpTools-8.5.4-15.fc14.src.rpm |  Bin 0 -> 462882 bytes
 UpTools-8.5.4-64bit.patch     |   18 +++++++++++++++++
 UpTools-8.5.4-s390.patch      |   42 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/UpTools-8.5.4-15.fc14.src.rpm b/UpTools-8.5.4-15.fc14.src.rpm
new file mode 100644
index 0000000..1f42447
Binary files /dev/null and b/UpTools-8.5.4-15.fc14.src.rpm differ
diff --git a/UpTools-8.5.4-64bit.patch b/UpTools-8.5.4-64bit.patch
new file mode 100644
index 0000000..e3d806a
--- /dev/null
+++ b/UpTools-8.5.4-64bit.patch
@@ -0,0 +1,18 @@
+diff -up UpTools-8.5.4/configure.64bit UpTools-8.5.4/configure
+--- UpTools-8.5.4/configure.64bit	2011-03-25 16:07:14.000000000 +0100
++++ UpTools-8.5.4/configure	2011-03-25 16:07:38.000000000 +0100
+@@ -10930,14 +10930,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+   # Let make expand exec_prefix. Allows to override the makevar 'prefix' later
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-#
+-case $host in #(
+-  *x86_64*) :
+-    libdir=$prefix/lib64 ;; #(
+-  *) :
+-    libdir=$prefix/lib ;;
+-esac
+-
+ # Checks for programs.
+ #Esta es otra manera de pisar las flags de manera amigable.
+ #cxxflags_save="$CXXFLAGS"
diff --git a/UpTools-8.5.4-s390.patch b/UpTools-8.5.4-s390.patch
new file mode 100644
index 0000000..70f16e4
--- /dev/null
+++ b/UpTools-8.5.4-s390.patch
@@ -0,0 +1,42 @@
+diff -up UpTools-8.5.4/include/UpTools/UpOp.h.s390 UpTools-8.5.4/include/UpTools/UpOp.h
+--- UpTools-8.5.4/include/UpTools/UpOp.h.s390	2011-03-25 15:14:26.000000000 +0100
++++ UpTools-8.5.4/include/UpTools/UpOp.h	2011-03-25 15:49:59.000000000 +0100
+@@ -66,7 +66,7 @@ std::string& operator<<( std::string& s 
+ std::string& operator<<( std::string& s , long long d );
+ std::string& operator<<( std::string& s , unsigned long long d );
+ std::string& operator<<( std::string& s , bool b );
+-#if __WORDSIZE==64
++#if __WORDSIZE==64 || defined(__s390__)
+ std::string& operator<<( std::string& s , size_t b );
+ #endif
+ 
+@@ -77,7 +77,7 @@ float&              operator<<( float&  
+ long long&          operator<<( long long& d         , const std::string& s );
+ unsigned long long& operator<<( unsigned long long& d, const std::string& s );
+ bool&               operator<<( bool& b              , const std::string& s );
+-#if __WORDSIZE==64
++#if __WORDSIZE==64 || defined(__s390__)
+ size_t&             operator<<( size_t& b              , const std::string& s );
+ #endif
+ 
+diff -up UpTools-8.5.4/UpOp.cc.s390 UpTools-8.5.4/UpOp.cc
+--- UpTools-8.5.4/UpOp.cc.s390	2011-03-25 15:14:42.000000000 +0100
++++ UpTools-8.5.4/UpOp.cc	2011-03-25 15:49:19.000000000 +0100
+@@ -42,7 +42,7 @@
+ 
+ 
+ /////////////////////////////////////////////////////////////////////
+-#if __WORDSIZE==64
++#if __WORDSIZE==64 || defined(__s390__)
+ std::string& operator<<(std::string& s,size_t n) {
+ 	char buf[32],*p=buf+31; *p=0;
+    do { *(--p) = '0'+(n%10); } while(n/=10);
+@@ -127,7 +127,7 @@ unsigned long long& operator<<(unsigned 
+    return n;
+ }
+ 
+-#if __WORDSIZE==64
++#if __WORDSIZE==64 || defined(__s390__)
+ size_t& operator<<(size_t& n,const std::string& s) {
+ 	size_t len = s.size();
+    if(len==0) return (n=0);


More information about the scm-commits mailing list