rpms/epiphany-extensions/devel epiphany-extensions.spec,1.45,1.46

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25354

Modified Files:
	epiphany-extensions.spec 
Log Message:
Fix license and BR, also get rid of \t characters



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- epiphany-extensions.spec	7 Apr 2008 16:45:50 -0000	1.45
+++ epiphany-extensions.spec	7 Apr 2008 20:10:55 -0000	1.46
@@ -1,42 +1,43 @@
-%global	ephy_major		2.22
-%global	ephy_min_version	%{ephy_major}.0
-%global gecko_version		1.9
-
-Name:		epiphany-extensions
-Version:	%{ephy_major}.1
-Release:	1%{?dist}
-Summary:	Extensions for Epiphany, the GNOME web browser
+%global ephy_major          2.22
+%global ephy_min_version    %{ephy_major}.0
+%global gecko_version       1.9
+
+Name:           epiphany-extensions
+Version:        %{ephy_major}.1
+Release:        1%{?dist}
+Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
 ## GPLv2 (only); and all other extensions are GPLv2+.
-License:	LGPLv2.1+ and GPLv2 and GPLv2+
-Group:		Applications/Internet
-URL:		http://www.gnome.org/projects/epiphany/extensions
-
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	epiphany-devel >= %{ephy_min_version}
-BuildRequires:	perl(XML::Parser)
-BuildRequires:	gettext
-BuildRequires:	opensp-devel
-BuildRequires:	pcre-devel
+License:        LGPLv2+ and GPLv2 and GPLv2+ and GFDL
+Group:          Applications/Internet
+URL:            http://www.gnome.org/projects/epiphany/extensions
+
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  epiphany-devel >= %{ephy_min_version}
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  gettext
+BuildRequires:  libtool
+BuildRequires:  opensp-devel
+BuildRequires:  pcre-devel
 ## gecko-devel is not strictly required, as epiphany-devel pulls it in.
 ## BuildRequire it anyway so we fail if not building against the version
 ## we are expecting to.
 BuildRequires:  gecko-devel-unstable = %{gecko_version}
 
-Requires:	epiphany >= %{ephy_min_version}
-Requires:	gecko-libs = %{gecko_version}
-Requires:	pygtk2 >= 2.11
+Requires:       epiphany >= %{ephy_min_version}
+Requires:       gecko-libs = %{gecko_version}
+Requires:       pygtk2 >= 2.11
 
-Requires(pre):	GConf2
+Requires(pre):  GConf2
 
 Requires(post): scrollkeeper
-Requires(post):	GConf2
+Requires(post): GConf2
 
-Requires(preun):	GConf2
+Requires(preun): GConf2
 
 Requires(postun): scrollkeeper
 
@@ -51,9 +52,9 @@
 %build
 ## XXX: We're forcibly building against Firefox until the XULrunner
 ## obsoletes/upgrade-path issues can be properly fixed. 
-%configure --disable-compiler-warnings --disable-scrollkeeper	\
-	--with-gecko=libxul-embedding				\
-	--with-extensions=really-all
+%configure --disable-compiler-warnings --disable-scrollkeeper   \
+           --with-gecko=libxul-embedding                        \
+           --with-extensions=really-all
 %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
@@ -69,10 +70,10 @@
 
 %pre
 if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas	\
-		%{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
+  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+  gconftool-2 --makefile-uninstall-rule \
+              %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas \
+              %{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
 fi
 
 
@@ -80,16 +81,16 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas	\
-	%{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
+            %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas \
+            %{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
 
 
 %preun
 if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas	\
-		%{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
+  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+  gconftool-2 --makefile-uninstall-rule \
+              %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas \
+              %{_sysconfdir}/gconf/schemas/epilicious.schemas > /dev/null ||:
 fi