SPECS: swiftfox.spec - fixes

[glen]

Author: glen                         Date: Thu Sep 28 12:59:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixes

---- Files affected:
SPECS:
   swiftfox.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/swiftfox.spec
diff -u SPECS/swiftfox.spec:1.6 SPECS/swiftfox.spec:1.7
--- SPECS/swiftfox.spec:1.6	Thu Sep 21 13:36:10 2006
+++ SPECS/swiftfox.spec	Thu Sep 28 14:58:57 2006
@@ -18,15 +18,15 @@
 Summary(pl):	Swiftfox - zoptymalizowana Mozilla Firefox, przeglądarka WWW
 Name:		swiftfox
 Version:	1.5.0.7
-Release:	0.1
+Release:	0.5
 License:	Non Distributable (http://getswiftfox.com/source.htm)
 Group:		X11/Applications/Networking
 Source0:	http://getswiftfox.com/source/%{name}-%{version}-source.tar.bz2
 # Source0-md5:	88943880a35ff91a7e2e334a503f3c12
 Source1:	mozilla-firefox.desktop
-Source2:	mozilla-firefox.sh
+Source2:	%{name}.sh
 Patch0:		mozilla-firefox-nss.patch
-Patch1:		mozilla-firefox-lib_path.patch
+Patch1:		%{name}-lib_path.patch
 Patch2:		mozilla-firefox-nss-system-nspr.patch
 Patch3:		mozilla-firefox-nopangoxft.patch
 Patch4:		mozilla-firefox-name.patch
@@ -52,6 +52,7 @@
 BuildRequires:	zip
 Requires(post):	mktemp
 Requires:	%{name}-lang-resources = %{version}
+Requires:	mozilla-launcher >= 1.51-0.2
 Requires:	nspr >= 1:4.6.1-2
 Requires:	nss >= 1:3.10.2
 Provides:	wwwbrowser
@@ -213,7 +214,10 @@
 	MOZILLA_BIN='$(DIST)/bin/%{name}-bin' \
 	EXCLUDE_NSPR_LIBS=1
 
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+sed '
+	s, at LIBDIR@,%{_libdir},
+	s, at APPNAME@,%{name},
+' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/%{name}-*linux*.tar.gz
 
@@ -261,7 +265,10 @@
 rm -rf $HOME
 EOF
 
-mv $RPM_BUILD_ROOT%{_bindir}/{mozilla-firefox,swiftfox}
+mv $RPM_BUILD_ROOT%{_firefoxdir}/{firefox,swiftfox}
+mv $RPM_BUILD_ROOT%{_firefoxdir}/{firefox,swiftfox}-bin
+mv $RPM_BUILD_ROOT%{_firefoxdir}/{mozilla,swiftfox}-xremote-client
+mv $RPM_BUILD_ROOT%{_firefoxdir}/run-{mozilla,swiftfox}.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -297,8 +304,7 @@
 %dir %{_firefoxdir}/init.d
 %attr(755,root,root) %{_firefoxdir}/*.so
 %attr(755,root,root) %{_firefoxdir}/*.sh
-%attr(755,root,root) %{_firefoxdir}/m*
-%attr(755,root,root) %{_firefoxdir}/f*
+%attr(755,root,root) %{_firefoxdir}/%{name}*
 %attr(755,root,root) %{_firefoxdir}/reg*
 %attr(755,root,root) %{_firefoxdir}/x*
 %{_pixmapsdir}/*
@@ -337,6 +343,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/09/28 12:58:57  glen
+- fixes
+
 Revision 1.6  2006/09/21 11:36:10  glen
 - packages on AC
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/swiftfox.spec?r1=1.6&r2=1.7&f=u