[packages/gnome-mime-data] - rename sr at ije locale to sr at ijekavian - dropped unnecessary libtoolize - use _npkgconfigdir macro -

qboosh qboosh at pld-linux.org
Sun Jan 6 15:34:24 CET 2013


commit 8b682f10fbe87f0f5acb52845209b4a01ec0e725
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 6 15:34:25 2013 +0100

    - rename sr at ije locale to sr at ijekavian
    - dropped unnecessary libtoolize
    - use _npkgconfigdir macro
    - release 3

 gnome-mime-data.spec | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/gnome-mime-data.spec b/gnome-mime-data.spec
index 6caa413..b8eb3db 100644
--- a/gnome-mime-data.spec
+++ b/gnome-mime-data.spec
@@ -3,27 +3,25 @@ Summary(pl.UTF-8):	Biblioteki wirtualnego systemu plików dla GNOME2
 Summary(pt_BR.UTF-8):	Arquivos de dados tipo MIME para o desktop GNOME
 Name:		gnome-mime-data
 Version:	2.18.0
-Release:	2
+Release:	3
 License:	LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.18/%{name}-%{version}.tar.bz2
 # Source0-md5:	541858188f80090d12a33b5a7c34d42c
-URL:		http://www.gnome.org/
 Patch0:		%{name}-duplicate-keys.patch
+URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 2.2.3
 BuildRequires:	intltool
-BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.446
 Provides:	gnome-vfs-data = %{version}
 Obsoletes:	gnome-vfs-data
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _pkgconfigdir   %{_datadir}/pkgconfig
-
 %description
 This module contains the base MIME and Application database for GNOME.
 It is meant to be accessed through the MIME functions in GnomeVFS.
@@ -55,7 +53,6 @@ Pliki potrzebne przy tworzeniu programów używajacych gnome-mime-data.
 %build
 %{__glib_gettextize}
 %{__intltoolize}
-%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -71,8 +68,9 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man5
 
 install man/gnome-vfs-mime.5 $RPM_BUILD_ROOT%{_mandir}/man5/gnome-vfs-mime.5
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr at Latn,sr at latin}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr at ije,sr at ijekavian}
+
 %find_lang %{name}
 
 %clean
@@ -80,12 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README NEWS
+%doc AUTHORS ChangeLog README
 %{_sysconfdir}/gnome-vfs-mime-magic
 %{_datadir}/application-registry
 %{_datadir}/mime-info
-%{_mandir}/man5/*
+%{_mandir}/man5/gnome-vfs-mime.5*
 
 %files devel
 %defattr(644,root,root,755)
-%{_pkgconfigdir}/*.pc
+%{_npkgconfigdir}/gnome-mime-data-2.0.pc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-mime-data.git/commitdiff/8b682f10fbe87f0f5acb52845209b4a01ec0e725



More information about the pld-cvs-commit mailing list