rpms/epiphany-extensions/FC-5 epiphany-extensions.spec,1.11,1.12

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Thu Jan 25 04:16:47 UTC 2007


Author: pgordon

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

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


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- epiphany-extensions.spec	13 Oct 2006 03:22:54 -0000	1.11
+++ epiphany-extensions.spec	25 Jan 2007 04:16:17 -0000	1.12
@@ -2,12 +2,12 @@
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.14.1.1
-Release: 2
+Version: %{ephy_major}.1.1
+Release: 3
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{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}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
@@ -29,28 +29,38 @@
 %{__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
 
 %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 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.14.1.1-3
+- 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, COPYING, and COPYING.README to the installed documentation (%%doc).
+
 * Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-2
 - Add proper post/postun Requires: scrollkeeper
 - Add proper gettext requirements for build-time translations support 




More information about the scm-commits mailing list