diff --git a/jitsi.spec b/jitsi.spec index 8509ec7..000781b 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -55,22 +55,50 @@ sed -i -e "s/_APP_NAME_/Jitsi/" $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 gzip $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 # copy the launcher script -cp resources/install/debian/jitsi.sh.tmpl $RPM_BUILD_ROOT/usr/bin/jitsi -sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/bin/jitsi +#cp resources/install/debian/jitsi.sh.tmpl $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/bin/jitsi # no more libaoss #sed -i -e "s@export LD_PRELOAD=/usr/lib/libaoss.so@export LD_PRELOAD=/usr/lib/libaoss.so.0@" $RPM_BUILD_ROOT/usr/bin/sip-communicator -chmod a+x $RPM_BUILD_ROOT/usr/bin/jitsi +#chmod a+x $RPM_BUILD_ROOT/usr/bin/jitsi # copy the menu icons cp resources/install/debian/jitsi-32.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi-32.xpm cp resources/install/debian/jitsi-16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi-16.xpm cp resources/install/debian/jitsi.svg $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi.svg + +# menu-entry +mkdir -p %{buildroot}%{_datadir}/applications +cat > %{buildroot}%{_datadir}/applications/%{name}.desktop < %{name} << EOF +#!/bin/sh + +#java -Dfelix.config.properties=file:%{_javadir}/sip-communicator/lib/felix.client.run.properties \ +# -Djava.util.logging.config.file=%{_javadir}/sip-communicator/lib/logging.properties \ +# org.apache.felix.main.Main + +exec java -jar %{_javadir}/%{name}/%{name}-%{version}.jar + +EOF + # copy the menu entry -cp resources/install/debian/jitsi.desktop.tmpl $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop -sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop -sed -i -e "s/_APP_NAME_/Jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop +#cp resources/install/debian/jitsi.desktop.tmpl $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop +#sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop +#sed -i -e "s/_APP_NAME_/Jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop # copy the sc-bundles cp sc-bundles/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles/ @@ -88,24 +116,24 @@ rm $RPM_BUILD_ROOT/usr/share/jitsi/lib/bundle/junit.jar cp lib/os-specific/linux/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/lib/ # copy the native libs -%ifarch i386 i586 i686 -cp lib/native/linux/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ -%else -cp lib/native/linux-64/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ -%endif +#%ifarch i386 i586 i686 +#cp lib/native/linux/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ +#%else +#cp lib/native/linux-64/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ +#%endif # copy the resources cp resources/install/logging.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/ cp lib/felix.client.run.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/ # Make felix deploy its bundles in ~/.felix/sip-communicator.bin -sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" $RPM_BUILD_ROOT/usr/share/jitsi/lib/felix.client.run.properties +#sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" $RPM_BUILD_ROOT/usr/share/jitsi/lib/felix.client.run.properties # fix shell script -sed -i -e "s/\/usr\/lib\/jni/\$LIBPATH\/native/" $RPM_BUILD_ROOT/usr/bin/jitsi -sed -i -e "s/\/usr\/share\/java\/jdic\.jar/\$LIBPATH\/jdic_stub\.jar:\$LIBPATH\/jdic-all\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi -sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.framework\.jar/\$LIBPATH\/felix\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi -sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.main\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi -sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/\/usr\/lib\/jni/\$LIBPATH\/native/" $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/\/usr\/share\/java\/jdic\.jar/\$LIBPATH\/jdic_stub\.jar:\$LIBPATH\/jdic-all\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.framework\.jar/\$LIBPATH\/felix\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.main\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi +#sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT diff --git a/jitsi.spec.old b/jitsi.spec.old index ca997c6..ec6374e 100644 --- a/jitsi.spec.old +++ b/jitsi.spec.old @@ -105,7 +105,7 @@ EOF rm -rf $RPM_BUILD_ROOT %post -#ln -sf /opt/%{name}/%{name} /usr/bin/sweethome + %postun #rm -rf /usr/bin/sweethome