rpms/epiphany-extensions/FC-6 epiphany-extensions.spec,1.15,1.16

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682/FC-6

Modified Files:
	epiphany-extensions.spec 
Log Message:
Fix directory ownership and don't package .la files; make macro usage more consistent; add AUTHORS to %doc


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-6/epiphany-extensions.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- epiphany-extensions.spec	2 Dec 2006 05:10:07 -0000	1.15
+++ epiphany-extensions.spec	25 Jan 2007 04:09:33 -0000	1.16
@@ -1,13 +1,13 @@
-%define ephy_major 2.16.0
+%define ephy_major 2.16
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.16.1
-Release: 1
+Version: %{ephy_major}.1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.16/%{name}-%{version}.tar.bz2
+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_major}
@@ -29,28 +29,39 @@
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} --all-name
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+%{find_lang} "%{name}-%{ephy_major}"
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 
 %postun
-scrollkeeper-update -q || :
+scrollkeeper-update -q ||:
 
-%files -f %{name}.lang
+%files -f %{name}-%{ephy_major}.lang
 %defattr(-,root,root,-)
-%doc COPYING COPYING.README ChangeLog README NEWS
+%doc AUTHORS COPYING COPYING.README ChangeLog README NEWS
 %{_datadir}/epiphany-extensions
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/omf/%{name}
-%{_libdir}/epiphany
+%exclude %{_libdir}/epiphany/%{ephy_major}/extensions/*.la
+%{_libdir}/epiphany/%{ephy_major}/extensions/
 
 %changelog
+* Wed Jan 14 2007 Peter Gordon <peter at thecodergeek.com> - 2.16.1-2
+- Make macro usage more consistent.
+- Use %%find_lang instead of a hardcoded call to 'find_lang.sh --all-name'
+- A couple of fixes from Brian Pepple:
+  (1) Own only the extensions subdirectory in %%_libdir/epiphany, not the
+  toplevel directory (which is owned by epiphany).
+  (2) Don't package libtool archive (*.la) files.
+- Add AUTHORS to the installed documentation (%%doc).
+
+
 * Fri Dec 01 2006 Peter Gordon <peter at thecodergeek.com> 2.16.1-1
 - Update to new upstream release (2.16.1)
 - Fix BuildRoot to be comply with Fedora Extras packaging policy