packages: jitsi/jitsi.spec, jitsi/dbus-lib64.patch (NEW), jitsi/jawt-link.p...

Thu May 12 00:10:44 CEST 2011

Author: glen                         Date: Wed May 11 22:10:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build some natives, add manual page

---- Files affected:
packages/jitsi:
   jitsi.spec (1.3 -> 1.4) , dbus-lib64.patch (NONE -> 1.1)  (NEW), jawt-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/jitsi/jitsi.spec
diff -u packages/jitsi/jitsi.spec:1.3 packages/jitsi/jitsi.spec:1.4

--- packages/jitsi/jitsi.spec:1.3	Wed May 11 22:12:05 2011
+++ packages/jitsi/jitsi.spec	Thu May 12 00:10:39 2011
@@ -3,7 +3,7 @@
 # - ensure all is really built
 # - cc/cflags for native build (find source first (currently prebuild libs used))
 %define		subver	3464
-%define		rel		0.9
+%define		rel		0.11
 Summary:	A Java VoIP and Instant Messaging client
 Name:		jitsi
 Version:	1.0
@@ -15,6 +15,8 @@
 # Source0-md5:	7f91e55a23c736e517471f80b4602513
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
+Patch0:		dbus-lib64.patch
+Patch1:		jawt-link.patch
 BuildRequires:	ant
 BuildRequires:	ant-nodeps
 BuildRequires:	jdk
@@ -39,6 +41,8 @@
 
 %prep
 %setup -q -n sip-communicator
+%patch0 -p1
+%patch1 -p1
 
 install -p %{SOURCE2} .
 %if "%{_lib}" != "lib"
@@ -57,32 +61,50 @@
 cp -p resources/install/doc/readme.txt README
 cp -p resources/install/doc/License.txt LICENSE
 
+# this does not work, need each of them as separate tag: <compilerarg value="-O2" />
+#%{__sed} -i -e 's,-O3,%{rpmcflags},' src/native/build.xml
+#%{__sed} -i -e 's,-O2,%{rpmcflags},' src/native/build.xml
+
 %build
+%{__sed} -e 's,_PACKAGE_NAME_,%{name},g;s,_APP_NAME_,%{name},g' \
+	resources/install/debian/sip-communicator.1.tmpl > %{name}.1
+
+#      TODO 'ant ffmpeg' to compile ffmpeg shared library
+#      TODO 'ant portaudio' to compile jnportaudio shared library
+#      TODO 'ant speex' to compile jspeex shared library
+
+%ant \
+	screencapture jawtrenderer g722 hid hwaddressretriever \
+	video4linux2 galagonotification
+
 # source code not US-ASCII
 export LC_ALL=en_US
 %ant rebuild
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/{lib,sc-bundles},%{_libdir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/{lib,sc-bundles},%{_libdir}/%{name}}
 
 cp -p sc-bundles/*.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/sc-bundles
 cp -p sc-bundles/os-specific/linux/*.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/sc-bundles
 
 cp -p lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
+cp -a lib/bundle $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/bundle/junit.jar
 cp -p lib/logging.properties lib/felix.client.run.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
 cp -p lib/os-specific/linux/*.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
 
 ## arch dependant libs
 install -d $RPM_BUILD_ROOT%{_libdir}
 %ifarch %{x8664}
-install -p lib/native/linux-64/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p lib/native/linux-64/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 %ifarch %{ix86}
-install -p lib/native/linux/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p lib/native/linux/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 
 install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp -p %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # Desktop Entry
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
@@ -97,6 +119,7 @@
 %defattr(644,root,root,755)
 %doc README LICENSE
 %attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so
 %{_datadir}/%{name}
@@ -110,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/05/11 22:10:39  glen
+- build some natives, add manual page
+
 Revision 1.3  2011/05/11 20:12:05  glen
 - more packaging fixes, package like .run script did
 

================================================================
Index: packages/jitsi/dbus-lib64.patch
diff -u /dev/null packages/jitsi/dbus-lib64.patch:1.1
--- /dev/null	Thu May 12 00:10:44 2011
+++ packages/jitsi/dbus-lib64.patch	Thu May 12 00:10:39 2011
@@ -0,0 +1,12 @@
+--- sip-communicator/src/native/build.xml~	2011-05-12 00:36:11.000000000 +0300
++++ sip-communicator/src/native/build.xml	2011-05-12 00:43:48.671393948 +0300
+@@ -663,7 +663,8 @@
+       <compilerarg value="-Wall" />
+       <compilerarg value="-O2" />
+       <compilerarg value="-I/usr/include/dbus-1.0" />
+-      <compilerarg value="-I/usr/lib/dbus-1.0/include" />
++      <compilerarg value="-I/usr/lib/dbus-1.0/include" if="cross_32" />
++      <compilerarg value="-I/usr/lib64/dbus-1.0/include" if="cross_64" />
+       <compilerarg value="-m32" if="cross_32" />
+       <compilerarg value="-m64" if="cross_64" />
+       <compilerarg value="-I${system.JAVA_HOME}/include" />

================================================================
Index: packages/jitsi/jawt-link.patch
diff -u /dev/null packages/jitsi/jawt-link.patch:1.1
--- /dev/null	Thu May 12 00:10:44 2011
+++ packages/jitsi/jawt-link.patch	Thu May 12 00:10:39 2011
@@ -0,0 +1,10 @@
+--- sip-communicator/src/native/build.xml~	2011-05-12 00:43:48.000000000 +0300
++++ sip-communicator/src/native/build.xml	2011-05-12 00:57:21.051853718 +0300
+@@ -210,6 +210,7 @@
+       
+       <linkerarg value="-L${system.JAVA_HOME}/jre/lib/amd64" />
+       <linkerarg value="-L${system.JAVA_HOME}/jre/lib/x86" />
++      <linkerarg value="-L${system.JAVA_HOME}/jre/lib/i386" />
+       <linkerarg value="-ljawt" location="end" />
+       
+       <!-- Linux specific flags -->
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jitsi/jitsi.spec?r1=1.3&r2=1.4&f=u

