Parcourir la source

Correct endian typo in case statement, fix putenv(3) param type, and link to common libs dynamically

Michael Schloh von Bennewitz il y a 22 ans
Parent
commit
9ffefb6a6f
1 fichiers modifiés avec 9 ajouts et 3 suppressions
  1. 9 3
      abiword/abiword.spec

+ 9 - 3
abiword/abiword.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Editor
 License:      GPL
 Version:      %{V_opkg}
-Release:      20031117
+Release:      20031118
 
 #   list of sources
 Source0:      http://download.sourceforge.net/sourceforge/abiword/abiword-%{V_dist}.tar.gz
@@ -82,13 +82,16 @@ AutoReqProv:  no
             %setup8  -q -n abiword-%{V_dist} -T -D -a 8
             %setup10 -q -n abiword-%{V_dist} -T -D -a 10
             ;;
-        *68*-* )
+        *86*-* )
             %setup1 -q -n abiword-%{V_dist} -T -D -a 1
             %setup3 -q -n abiword-%{V_dist} -T -D -a 3
             %setup5 -q -n abiword-%{V_dist} -T -D -a 5
             %setup7 -q -n abiword-%{V_dist} -T -D -a 7
             %setup9 -q -n abiword-%{V_dist} -T -D -a 9
             ;;
+        * ) echo "Only SPARC and ix86 architectures are supported" 2>&1
+            exit 1
+            ;;
     esac
     %{l_shtool} subst \
         -e 's;^\( *ICONV_CONST char\);//\1;' \
@@ -122,6 +125,9 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;\(/clipart/\);/abiword\1;' \
         abi/src/wp/ap/xp/ap_EditMethods.cpp
+    %{l_shtool} subst \
+        -e 's;putenv(MYLANG;putenv((char *)MYLANG;' \
+        abi/src/af/xap/unix/xap_UnixEncodingManager.cpp
     %{l_shtool} subst \
         -e 's;\(/icons/\);/abiword\1;' \
         abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp \
@@ -239,7 +245,7 @@ AutoReqProv:  no
         --with-libjpeg-prefix=%{l_prefix}
 
     #   build the program
-    %{l_make} %{l_mflags} AbiWord_2_0_LDFLAGS=-static
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT