[chatzilla] Do not edit original launcher script and package it in the srpm

Hicham HAOUARI hicham at fedoraproject.org
Sun Sep 11 11:40:17 UTC 2011


commit 5547570ad3cc108efd6c11080751b6702dd7b661
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Sun Sep 11 11:39:54 2011 +0000

    Do not edit original launcher script and package it in the srpm

 chatzilla      |    4 ++--
 chatzilla.spec |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/chatzilla b/chatzilla
index fabe381..7450c47 100644
--- a/chatzilla
+++ b/chatzilla
@@ -1,7 +1,7 @@
 #!/bin/bash
 USAGE="Usage: `basename $0` [-h|--help] [-chat|--chat URL]"
 if [ $# -eq 0 ]; then
-    xulrunner -app /usr/share/chatzilla-0.9.87/application.ini --chat "irc://"
+    xulrunner -app @CZ_INSTALL_PATH@/application.ini --chat "irc://"
 else
 case $1 in
 -h|--help)
@@ -10,7 +10,7 @@ case $1 in
     ;;
 -chat|--chat)
     if [[ $2 =~ irc:// ]]; then
-        xulrunner -app /usr/share/chatzilla-0.9.87/application.ini --chat $2
+        xulrunner -app @CZ_INSTALL_PATH@/application.ini --chat $2
     else
         echo "$1 needs a valid irc URL"
     fi
diff --git a/chatzilla.spec b/chatzilla.spec
index eae75d8..e6a5b39 100644
--- a/chatzilla.spec
+++ b/chatzilla.spec
@@ -4,7 +4,7 @@
 
 Name:           chatzilla
 Version:        0.9.87
-Release:        1.%{rev}hg%{?dist}
+Release:        2.%{rev}hg%{?dist}
 Summary:        Standalone Mozilla IRC Client, no browsers attached
 
 Group:          Applications/Internet
@@ -57,7 +57,8 @@ to IRC handlers on gnome
 sed -i 's|@REVISION@|%{version}|g' xpi/resources/{application.ini,brand.properties,brand.dtd,chatzilla-prefs.xr.js}
 sed -i 's|@BUILDID@|%{buildid}|g' xpi/resources/application.ini
 sed -i 's|@__RPM_REL__@|%{release}|g' xul/content/static.js
-sed -i 's|@CZ_INSTALL_PATH@|%{_datadir}/%{name}-%{version}|g' %{SOURCE5}
+cp %{SOURCE5} .
+sed -i 's|@CZ_INSTALL_PATH@|%{_datadir}/%{name}-%{version}|g' %{name}
 
 %build
 pushd xpi
@@ -85,7 +86,7 @@ pushd $DESTDIR
 popd
 
 # Install launcher
-install -Dpm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -Dpm 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 # Install Icons
 install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -170,6 +171,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 11 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.87-2.1450hg
+- Do not edit original launcher script and package it in the srpm
+
 * Sun Sep 11 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.87-1.1450hg
 - Update to latest 0.9.87
 - Fix rhbz #717095


More information about the scm-commits mailing list