packages: jitsi/jitsi.spec - more packaging fixes, package like .run script...

[glen]

Author: glen                         Date: Wed May 11 20:12:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more packaging fixes, package like .run script did

---- Files affected:
packages/jitsi:
   jitsi.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/jitsi/jitsi.spec
diff -u packages/jitsi/jitsi.spec:1.2 packages/jitsi/jitsi.spec:1.3
--- packages/jitsi/jitsi.spec:1.2	Wed May 11 21:15:42 2011
+++ packages/jitsi/jitsi.spec	Wed May 11 22:12:05 2011
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
 # TODO
 # - ensure all is really built
-# - cc/cflags for native build
+# - cc/cflags for native build (find source first (currently prebuild libs used))
 %define		subver	3464
-%define		rel		0.1
+%define		rel		0.9
 Summary:	A Java VoIP and Instant Messaging client
 Name:		jitsi
 Version:	1.0
 Release:	0.%{subver}.%{rel}
-License:	LGPL
+License:	LGPL 2.1
 Group:		Applications/Communications
 URL:		http://www.jitsi.org/
 Source0:	http://download.jitsi.org/jitsi/src/sip-communicator-src-%{version}-beta1-nightly.build.%{subver}.zip
@@ -18,10 +18,12 @@
 BuildRequires:	ant
 BuildRequires:	ant-nodeps
 BuildRequires:	jdk
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
+Requires:	jpackage-utils
 Obsoletes:	sip-communicator
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,6 +40,19 @@
 %prep
 %setup -q -n sip-communicator
 
+install -p %{SOURCE2} .
+%if "%{_lib}" != "lib"
+%{__sed} -i -e 's,/usr/lib,%{_libdir},' %{name}.sh
+%endif
+
+# gtk+1
+%{__rm} -v lib/native/linux*/*mozembed*gtk1.2*
+
+# libgtkembedmoz.so not satisfiable right now
+# too old xulrunner?, xulrunner-libs 1.8 contained it
+%{__rm} -v lib/native/linux*/libmozembed-linux-gtk2.so
+%{__rm} -v lib/native/linux*/mozembed-linux-gtk2
+
 # docs
 cp -p resources/install/doc/readme.txt README
 cp -p resources/install/doc/License.txt LICENSE
@@ -49,39 +64,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/{lib,sc-bundles},%{_libdir}/%{name}}
 
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/sc-bundles
-cp -p sc-bundles/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/sc-bundles
+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
 
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/sc-bundles/os-specific
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/sc-bundles/os-specific/linux
-cp -p sc-bundles/os-specific/linux/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/sc-bundles/os-specific/linux
-
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
-cp -p lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
-
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib/os-specific/linux
-cp -p lib/os-specific/linux/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/lib/os-specific/linux
+cp -p lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
+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}
+install -p lib/native/linux-64/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 %ifarch %{ix86}
-install -p lib/native/linux/* $RPM_BUILD_ROOT%{_libdir}
+install -p lib/native/linux/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-# Icon
-install -D -p resources/install/linux/sc-logo.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-install -D -p resources/images/logo/sc_logo.svg $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.svg
-
-# Desktop menu entry
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+# Desktop Entry
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+cp -p resources/install/linux/sc-logo.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p resources/images/logo/sc_logo.svg $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.svg
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 %clean
@@ -91,11 +97,9 @@
 %defattr(644,root,root,755)
 %doc README LICENSE
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/mozembed-linux-gtk1.2
-%attr(755,root,root) %{_libdir}/mozembed-linux-gtk2
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/lib*.so
+%{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 %{_pixmapsdir}/%{name}.svg
@@ -106,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/05/11 20:12:05  glen
+- more packaging fixes, package like .run script did
+
 Revision 1.2  2011/05/11 19:15:42  glen
 - packaging fixes
 
================================================================

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