[epiphany] Get rid of MOZ_OPT_FLAGS handling

Kalev Lember kalev at fedoraproject.org
Fri Feb 22 14:13:29 UTC 2013


commit 297f3cda544749d1287337eb5d3ce268742e6be4
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Feb 22 15:08:29 2013 +0100

    Get rid of MOZ_OPT_FLAGS handling
    
    ... and other minor spec file cleanup. Epiphany doesn't use the mozilla
    engine for quite some time already.

 epiphany.spec |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/epiphany.spec b/epiphany.spec
index 0c5e736..c36742e 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,7 +2,7 @@ Summary: Web browser for GNOME
 Name: epiphany
 Epoch: 1
 Version: 3.7.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 3.7
 License: GPLv2+ and GFDL
 Group: Applications/Internet
@@ -67,12 +67,6 @@ pref("general.useragent.vendorSub", "%{version}-%{release}");
 EOF
 
 %build
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
-
-export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
-
 %configure --with-distributor-name=Fedora
 make %{?_smp_mflags}
 
@@ -82,17 +76,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --with-gnome
 
-# Remove the bookmarks editor menu item
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/bme.desktop
-
-# Don't ship icon caches, either
-rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/icon-theme.cache
-rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/HighContrastLargePrint/icon-theme.cache
-rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/HighContrastLargePrintInverse/icon-theme.cache
-
-# LowContrastLargePrint seems to be obsolete, so remove it until further notice
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
-
 
 %post
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -114,13 +97,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/GConf/gsettings/epiphany.convert
 %{_bindir}/epiphany
 %{_bindir}/ephy-profile-migrator
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/epiphany.desktop
 %{_datadir}/epiphany
 %{_mandir}/man*/*
 %{_datadir}/dbus-1/services/org.gnome.Epiphany.service
 
 
 %changelog
+* Fri Feb 22 2013 Kalev Lember <kalevlember at gmail.com> - 1:3.7.90-2
+- Get rid of MOZ_OPT_FLAGS handling
+
 * Fri Feb 22 2013 Kalev Lember <kalevlember at gmail.com> - 1:3.7.90-1
 - Update to 3.7.90
 - Remove and obsolete the -devel subpackage


More information about the scm-commits mailing list