Author: glen Date: Mon Sep 8 21:12:26 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - add desktop integration, simplify
---- Files affected: SPECS: jalbum.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/jalbum.spec diff -u SPECS/jalbum.spec:1.4 SPECS/jalbum.spec:1.5 --- SPECS/jalbum.spec:1.4 Mon Sep 8 22:54:54 2008 +++ SPECS/jalbum.spec Mon Sep 8 23:12:20 2008 @@ -1,15 +1,16 @@ # $Revision$, $Date$ # TODO # - system java deps from lib/ dir -# - desktop file Summary: Jalbum web album software Name: jalbum Version: 8.0.9 -Release: 0.2 +Release: 0.6 License: freeware Group: Applications/Publishing Source0: http://jalbum.net/download/8.0/Linux/NoVM/Jalbuminstall.bin # Source0-md5: 0e10280a6202fd9ae86336e0a0020e1b +Source1: %{name}.desktop +Source2: %{name}.png URL: http://jalbum.net/ BuildRequires: rpmbuild(macros) >= 1.268 Requires: jre @@ -17,6 +18,11 @@ #BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%ifnarch %{ix86} +# only on x86 something to strip +%define _enable_debug_packages 0 +%endif + %define _appdir %{_libdir}/%{name} %description @@ -46,11 +52,8 @@ rm -f dist/JAlbum/lib/sunos_zg_ia_sf.jar for jar in $(find -name '*_zg_ia_sf.jar'); do - path=${jar%/*} - subdir=${jar##*/} - subdir=${subdir%*_zg_ia_sf.jar} - - unzip -qq -a $jar -d $path/$subdir + dir=${jar%*_zg_ia_sf.jar} + unzip -qq -a $jar -d $dir rm -f $jar done @@ -69,12 +72,18 @@ exec %{_bindir}/java -Xmx512M -jar %{_appdir}/JAlbum.jar EOF +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name} +%{_pixmapsdir}/%{name}.png +%{_desktopdir}/%{name}.desktop %dir %{_appdir} %{_appdir}/JAlbum.jar %{_appdir}/ext @@ -177,6 +186,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2008/09/08 21:12:20 glen +- add desktop integration, simplify + Revision 1.4 2008/09/08 20:54:54 glen - functions now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jalbum.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
