[chatzilla/f16] Update to 0.9.87
Hicham HAOUARI
hicham at fedoraproject.org
Sun Sep 11 11:04:40 UTC 2011
commit 0657af1b161b74fd5b89f7fe46d87e35629fcf97
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sun Sep 11 11:04:19 2011 +0000
Update to 0.9.87
.gitignore | 1 +
chatzilla | 23 +++++
chatzilla-0.9.86-meta-reorder.patch | 19 -----
chatzilla-0.9.86-unwrap-frame.patch | 12 ---
...> chatzilla-0.9.87-0b531e81dcaa-xulrunner.patch | 12 ++--
...atch => chatzilla-0.9.87-add-menupopupids.patch | 0
chatzilla.desktop | 10 +++
chatzilla.spec | 85 ++++++++------------
sources | 2 +-
9 files changed, 73 insertions(+), 91 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c7baf4..f4fc356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
239243fd40b4.tar.bz2
/2c5f8e558d1d.tar.bz2
+/0b531e81dcaa.tar.bz2
diff --git a/chatzilla b/chatzilla
new file mode 100644
index 0000000..fabe381
--- /dev/null
+++ b/chatzilla
@@ -0,0 +1,23 @@
+#!/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://"
+else
+case $1 in
+-h|--help)
+ echo $USAGE
+ exit 0
+ ;;
+-chat|--chat)
+ if [[ $2 =~ irc:// ]]; then
+ xulrunner -app /usr/share/chatzilla-0.9.87/application.ini --chat $2
+ else
+ echo "$1 needs a valid irc URL"
+ fi
+ ;;
+*)
+ echo $USAGE
+ exit 0
+ ;;
+esac
+fi
diff --git a/chatzilla-0.9.86-2c5f8e558d1d-xulrunner.patch b/chatzilla-0.9.87-0b531e81dcaa-xulrunner.patch
similarity index 98%
rename from chatzilla-0.9.86-2c5f8e558d1d-xulrunner.patch
rename to chatzilla-0.9.87-0b531e81dcaa-xulrunner.patch
index ed60628..dfabefd 100644
--- a/chatzilla-0.9.86-2c5f8e558d1d-xulrunner.patch
+++ b/chatzilla-0.9.87-0b531e81dcaa-xulrunner.patch
@@ -54,7 +54,7 @@ diff -Naur chatzilla-239243fd40b4/xpi/resources/application.ini chatzilla/xpi/re
+
+[Gecko]
+MinVersion=1.8
-+MaxVersion=2.0.*
++MaxVersion=6.*
+
+[XRE]
+EnableExtensionManager=Try it, see if I care.
@@ -275,14 +275,14 @@ diff -Naur chatzilla-239243fd40b4/xul/content/static.js chatzilla/xul/content/st
+++ chatzilla/xul/content/static.js 2010-06-26 15:40:29.000000000 +0100
@@ -43,7 +43,7 @@
- const __cz_version = "0.9.86";
+ const __cz_version = "0.9.87";
const __cz_condition = "green";
-const __cz_suffix = "";
-+const __cz_suffix = "rdmsoft";
++const __cz_suffix = "@__RPM_REL__@";
const __cz_guid = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
- const __cz_locale = "0.9.86";
+ const __cz_locale = "0.9.87";
-@@ -528,6 +528,8 @@
+@@ -526,6 +526,8 @@ function initApplicationCompatibility()
case "{" + __cz_guid + "}":
// We ARE the app, in other words, we're running in XULRunner.
client.host = "XULRunner";
@@ -291,7 +291,7 @@ diff -Naur chatzilla-239243fd40b4/xul/content/static.js chatzilla/xul/content/st
break;
case "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": // SeaMonkey
client.host = "Mozilla";
-@@ -590,6 +592,31 @@
+@@ -588,6 +590,31 @@ function initApplicationCompatibility()
function initIcons()
{
diff --git a/chatzilla-0.9.86-add-menupopupids.patch b/chatzilla-0.9.87-add-menupopupids.patch
similarity index 100%
rename from chatzilla-0.9.86-add-menupopupids.patch
rename to chatzilla-0.9.87-add-menupopupids.patch
diff --git a/chatzilla.desktop b/chatzilla.desktop
new file mode 100644
index 0000000..d14f1b0
--- /dev/null
+++ b/chatzilla.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=ChatZilla
+Comment=Standalone Mozilla IRC Client, no browsers attached
+TryExec=chatzilla
+Exec=chatzilla
+Icon=chatzilla
+Type=Application
+Categories=Network;GTK;IRCClient;
+StartupNotify=true
+MimeType=x-scheme-handler/irc;
diff --git a/chatzilla.spec b/chatzilla.spec
index 35d8f73..eae75d8 100644
--- a/chatzilla.spec
+++ b/chatzilla.spec
@@ -1,10 +1,10 @@
-%define changeset 2c5f8e558d1d
-%define rev 1292
+%define changeset 0b531e81dcaa
+%define rev 1450
%define buildid %(echo `date +%Y%m%d%H`)
Name: chatzilla
-Version: 0.9.86
-Release: 9.%{rev}hg%{?dist}
+Version: 0.9.87
+Release: 1.%{rev}hg%{?dist}
Summary: Standalone Mozilla IRC Client, no browsers attached
Group: Applications/Internet
@@ -15,6 +15,8 @@ Source1: %{name}.schemas
Source2: %{name}.1
Source3: README
Source4: http://twpol.dyndns.org/temp/cz_logo.svg
+Source5: %{name}
+Source6: %{name}.desktop
BuildRequires: zip desktop-file-utils python
BuildRequires: ImageMagick
@@ -22,20 +24,21 @@ Requires: xulrunner hicolor-icon-theme
BuildArch: noarch
+%if %{fedora} > 14
+Obsoletes: %{name}-gnome < 0.9.86-10
+%endif
+
# Patch0 : make chatzilla standalone xulrunner app
Patch0: %{name}-%{version}-%{changeset}-xulrunner.patch
# Patch1 : this patch is needed if we want to add menus after to the ui
Patch1: %{name}-%{version}-add-menupopupids.patch
-# Patch2 : https://bugzilla.mozilla.org/show_bug.cgi?id=605001
-Patch2: %{name}-%{version}-unwrap-frame.patch
-# Patch3 : https://bugzilla.mozilla.org/show_bug.cgi?id=605001
-Patch3: %{name}-%{version}-meta-reorder.patch
%description
ChatZilla is normally used as part of SeaMonkey, or an extension
to other browsers. However, it can also run under XULRunner, allowing
ChatZilla to be used standalone, independent of a web browser.
+%if %{fedora} < 15
%package gnome
Summary: Gnome integration for standalone chatzilla
Requires: GConf2
@@ -44,16 +47,17 @@ Requires: %{name} = %{version}-%{release}
%description gnome
Gnome integration for standalone chatzilla, this package adds chatzilla
to IRC handlers on gnome
+%endif
%prep
%setup -q -n %{name}-%{changeset}
%patch0 -p1 -b .xr
%patch1 -p1 -b .add-menupopupids
-%patch2 -p1 -b .unwrap-frame
-%patch3 -p1 -b .meta-reorder
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}
%build
pushd xpi
@@ -80,35 +84,8 @@ pushd $DESTDIR
install -Dpm 644 $FEDIR/xpi/resources/{brand.dtd,brand.properties} chrome/branding
popd
-# Add launcher
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/%{name}
-#!/bin/bash
-USAGE="Usage: \`basename \$0\` [-h|--help] [-chat|--chat URL]"
-if [ \$# -eq 0 ]; then
- xulrunner -app %{_datadir}/%{name}-%{version}/application.ini --chat "irc://"
-else
-case \$1 in
--h|--help)
- echo \$USAGE
- exit 0
- ;;
--chat|--chat)
- if [[ \$2 =~ irc:// ]]; then
- xulrunner -app %{_datadir}/%{name}-%{version}/application.ini --chat \$2
- else
- echo "\$1 needs a valid irc URL"
- fi
- ;;
-*)
- echo \$USAGE
- exit 0
- ;;
-esac
-fi
-EOF
-
-chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
+# Install launcher
+install -Dpm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
# Install Icons
install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -128,22 +105,13 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/chrome/icons/default
popd
# Install Desktop File
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-[Desktop Entry]
-Name=ChatZilla
-Comment=Standalone Mozilla IRC Client, no browsers attached
-TryExec=chatzilla
-Exec=chatzilla
-Icon=chatzilla
-Type=Application
-Categories=Network;GTK;IRCClient;
-StartupNotify=true
-EOF
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install %{SOURCE6} \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications
+%if %{fedora} < 15
#Install schemas file
install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%endif
#Install manual page
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/man/man1
@@ -166,6 +134,7 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%if %{fedora} < 15
%post gnome
# Install schema
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -182,7 +151,7 @@ if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{name}.schemas >& /dev/null || :
fi
-
+%endif
%files
%defattr(-,root,root,-)
@@ -193,12 +162,22 @@ fi
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/man/man1/%{name}.1.gz
+%if %{fedora} < 15
%files gnome
%defattr(-,root,root,-)
%doc README
%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%endif
%changelog
+* 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
+- Use our release tag as suffix instead of rdmsoft ( approved by upstream )
+- Obsolete gnome subpackage on fedora > 14 ( gnome no longer rely on gconf for mime handlers )
+- Move the launcher and desktop file as separate sources
+- Drop gecko >= 2 compatibility patches ( backports )
+
* Thu Mar 31 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.86-9.1292hg
- Use an svg icon as source so that it looks better under gnome-shell
diff --git a/sources b/sources
index 4e11f39..0974771 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9151ff7410b08e986c7261d8415274c0 2c5f8e558d1d.tar.bz2
+971da35f3ed4b302963d1b89a73db953 0b531e81dcaa.tar.bz2
More information about the scm-commits
mailing list