reenable branding-upstream package
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 01 Jul 2011 13:05:42 +0200
changeset 286 b1d254616456
parent 285 0287f70d86e9
child 287 79d59c9143a2
reenable branding-upstream package
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Jun 28 20:24:48 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Jul 01 13:05:42 2011 +0200
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul  1 06:45:08 UTC 2011 - wr@rosenauer.org
+
+- create upstream branding package again (supposedly empty)
+  (bnc#703401)
+- fix build on SLE11 (changes do not affect/are not applied for
+  later versions)
+
 -------------------------------------------------------------------
 Wed Jun 22 06:41:17 UTC 2011 - wr@rosenauer.org
 
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Jun 28 20:24:48 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jul 01 13:05:42 2011 +0200
@@ -495,7 +495,6 @@
 %dir %{progdir}/distribution/
 %{progdir}/chrome/icons
 %{progdir}/components/
-#%exclude %{progdir}/defaults/profile/bookmarks.html
 %{progdir}/defaults/
 %{progdir}/dictionaries/
 %dir %{progdir}/extensions/
@@ -509,7 +508,6 @@
 %{progdir}/application.ini
 %{progdir}/blocklist.xml
 %{progdir}/dependentlibs.list
-#%{progdir}/greprefs.js
 %{progdir}/*.so
 %{progdir}/mozilla-xremote-client
 %{progdir}/omni.jar
@@ -552,11 +550,11 @@
 %dir %{progdir}/extensions/
 %endif
 
-#%files branding-upstream
-#%defattr(-,root,root)
-#%dir %{progdir}
-#%dir %{progdir}/defaults/
-#%{progdir}/defaults/profile/bookmarks.html
+# this package does not need to provide files but is needed to fulfill
+# requirements if no other branding package is to be installed
+%files branding-upstream
+%defattr(-,root,root)
+%dir %{progdir}
 
 %if %crashreporter
 %files buildsymbols