Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	jxplorer.spec
@@ -8,11 +8,9 @@ Source0: JXv3.2deploy.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build -Packager: Carsten Schoene <cs@linux-administrator.com> -Vendor: linux-administrator.com BuildArch: noarch -Requires: java-1_5_0-sun -Requires: java-1_5_0-sun-alsa +Requires: java-1_6_0-sun +Requires: java-1_6_0-sun-alsa BuildRequires: glibc-devel gcc gcc-c++ libgcc unzip %description @@ -28,21 +26,18 @@ %setup -n %{name} %install -install -d 755 $RPM_BUILD_ROOT/opt/%{name} -install -d 755 $RPM_BUILD_ROOT/%{_prefix}/share/applications +install -d 755 $RPM_BUILD_ROOT/%{_prefix}/share/%{name} +#install -d 755 $RPM_BUILD_ROOT/%{_prefix}/share/applications cd $RPM_BUILD_DIR/%{name} -cp -R * $RPM_BUILD_ROOT/opt/%{name}/ -chmod 755 $RPM_BUILD_ROOT/opt/%{name}/%{name}.sh +cp -R * $RPM_BUILD_ROOT/%{_prefix}/share/%{name}/ +chmod 755 $RPM_BUILD_ROOT/%{_prefix}/share/%{name}/%{name}.sh # complete desktop file -cp %{S:1} $RPM_BUILD_ROOT/opt/%{name}/ +cp %{S:1} $RPM_BUILD_ROOT/%{_prefix}/share/%{name}/ # desktop file -install -d 755 $RPM_BUILD_ROOT/root/Desktop -cd $RPM_BUILD_ROOT/root/Desktop -ln -sf /opt/%{name}/%{name}.desktop -cd $RPM_BUILD_ROOT/%{_prefix}/share/applications -ln -sf /opt/%{name}/%{name}.desktop +##cd $RPM_BUILD_ROOT/%{_prefix}/share/applications +##ln -sf /%{_prefix}/share/%{name}/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT/* @@ -51,9 +46,8 @@ %files %defattr(-,root,root) -/opt/%{name} -/root/Desktop/jxplorer.desktop -%{_prefix}/share/applications/jxplorer.desktop +%{_prefix}/share/%{name} +##%{_prefix}/share/applications/jxplorer.desktop %changelog * Sun Apr 06 2008 Carsten Schoene <cs@linux-administrator.com>