From e820e82275a5d50d2b4eddea901febe6f90aab033b023295132081d43e30c3ef Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 16 Aug 2007 16:19:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=16

---
 MozillaFirefox.changes    |  5 +++++
 MozillaFirefox.spec       | 14 +++-----------
 OneClickInstallUrlHandler |  2 --
 ymp-mime.patch            | 34 ----------------------------------
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 OneClickInstallUrlHandler
 delete mode 100644 ymp-mime.patch

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index f57409b2..a769f01a 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 16 14:57:27 CEST 2007 - mauro@suse.de 
+
+- Revert previous change.
+
 -------------------------------------------------------------------
 Tue Aug 14 11:58:23 CEST 2007 - mauro@suse.de
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index a1b22ed1..cc3958fd 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -26,7 +26,7 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 Obsoletes:      mozilla
 %endif
 Version:        2.0.0.5
-Release:        14
+Release:        15
 Summary:        Mozilla Firefox Web Browser
 URL:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -53,7 +53,6 @@ Source11:       firefox48.png
 Source16:       firefox.1
 Source17:       firefox-suse-default-prefs.js
 Source18:       firefox.schemas
-Source19:       OneClickInstallUrlHandler
 Patch1:         visibility.patch
 Patch2:         rpath.patch
 Patch3:         gcc-undefined-ops.patch
@@ -96,7 +95,6 @@ Patch37:        make-perl.patch
 Patch38:        tango-maxversion.patch
 # pango-cairo.patch dbus.patch startup.patch
 Patch100:       configure.patch
-Patch102:       ymp-mime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         libstdc++ fileutils textutils /bin/sh gconf2
 Requires:       /usr/lib/libaoss.so
@@ -221,7 +219,6 @@ pushd $RPM_BUILD_DIR
 %patch38
 popd
 %patch100
-%patch102 -p 1
 %if %has_system_nss
 #%patch101
 %endif
@@ -423,10 +420,6 @@ chmod 755 %{my_requires}
 %define __find_requires %{my_requires}
 %endif
 %find_gconf_schemas
-%if %suse_version > 1020
-mkdir $RPM_BUILD_ROOT/sbin
-install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/sbin/OneClickInstallUrlHandler
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -556,11 +549,10 @@ exit 0
 %files translations -f %{_tmppath}/translations.list
 %defattr(-,root,root)
 %endif
-%if %suse_version >= 1020
-/sbin/OneClickInstallUrlHandler
-%endif
 
 %changelog
+* Thu Aug 16 2007 - mauro@suse.de 
+- Revert previous change.
 * Tue Aug 14 2007 - mauro@suse.de
 - Added support for ymp in the mimetypes.rdf
 - Added OneClickInstallUrlHandler for handing the actual call from firefox.
diff --git a/OneClickInstallUrlHandler b/OneClickInstallUrlHandler
deleted file mode 100644
index d8046278..00000000
--- a/OneClickInstallUrlHandler
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/sbin/YaST2 OneClickInstallUrlHandler $@
\ No newline at end of file
diff --git a/ymp-mime.patch b/ymp-mime.patch
deleted file mode 100644
index 85656266..00000000
--- a/ymp-mime.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur mozilla/profile/defaults/mimeTypes.rdf mozilla-mp/profile/defaults/mimeTypes.rdf
---- mozilla/profile/defaults/mimeTypes.rdf	2003-01-24 01:46:11.000000000 +0100
-+++ mozilla-mp/profile/defaults/mimeTypes.rdf	2007-08-14 10:53:10.721393000 +0200
-@@ -51,6 +51,30 @@
- <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-          xmlns:NC="http://home.netscape.com/NC-rdf#">
- 
-+
-+  <RDF:Description RDF:about="urn:mimetype:externalApplication:text/x-suse-ymu"
-+                   NC:path="/sbin/OneClickInstallUrlHandler"
-+                   NC:prettyName="OneClickInstallUrlHandler" />
-+          <RDF:Description RDF:about="urn:mimetype:text/x-suse-ymu"
-+                   NC:value="text/x-suse-ymu"
-+                   NC:editable="true"
-+                   NC:description=""
-+                                   >
-+                                 <NC:handlerProp
-+                   RDF:resource="urn:mimetype:handler:text/x-suse-ymu"/>
-+                </RDF:Description>
-+                   <RDF:Description
-+                   RDF:about="urn:mimetype:handler:text/x-suse-ymu"
-+                   NC:alwaysAsk="false"
-+                   NC:saveToDisk="false"
-+                   NC:useSystemDefault="false"
-+                   NC:handleInternal="false">
-+    <NC:externalApplication
-+    RDF:resource="urn:mimetype:externalApplication:text/x-suse-ymu"/>
-+  </RDF:Description>
-+
-+
-+
-   <RDF:Description about="urn:mimetypes"> 
-     <NC:MIME-types> 
-       <RDF:Seq about="urn:mimetypes:root">