rpms/ser/FC-3 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/extras/rpms/ser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-3

Modified Files:
	ser.spec 
Added Files:
	ser-0.9.6-ppc.patch 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
- Fix buildissue with %{_libdir}


ser-0.9.6-ppc.patch:

--- NEW FILE ser-0.9.6-ppc.patch ---
--- ser-0.9.6/modules/postgres/aug_sysdep.h.orig	2006-03-30 16:07:32.113066656 +0200
+++ ser-0.9.6/modules/postgres/aug_sysdep.h	2006-03-30 16:05:31.611385696 +0200
@@ -225,6 +225,16 @@
 typedef unsigned int augUInt32;
 
 #endif /* x86-64 */
+
+#if defined(__powerpc)
+
+#if defined(__GNUC__)
+#define AUG_CONFIGURATION	"Linux PowerPC with GCC"
+#endif
+
+typedef unsigned int augUInt32;
+
+#endif /* PowerPC */
 #endif /* linux */
 
 /*


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ser.spec	29 Mar 2006 11:18:24 -0000	1.1
+++ ser.spec	30 Mar 2006 16:34:29 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -12,6 +12,7 @@
 Source2: serweb.conf
 Source3: ser.init
 Patch0: serweb-path.patch
+Patch1: ser-0.9.6-ppc.patch
 URL: http://www.iptel.org/ser/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel
@@ -66,6 +67,7 @@
 %setup -q
 %setup -q -a 1
 %patch0 -p1 -b .path
+%patch1 -p1 -b .ppc
 
 # Enable SQL support for the acc module
 sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile 
@@ -75,19 +77,19 @@
 
 
 %build
-%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/
+%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules
 
 for MOD in %{special_modules}; do
-	%{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/
+	%{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot}
+%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules
 
 for MOD in %{special_modules}; do
-	%{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot}
+	%{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules
 done
 
 # postgres extras
@@ -199,6 +201,12 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
+- Fix buildissue with %%{_libdir}
+
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-3
+- PPC patch to build the postgresql module on ppc
+
 * Tue Mar 28 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-2
 - Changes to the spec-file, to conform to FE policies.