Author: megabajt Date: Fri Sep 19 23:22:28 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: SPECS: shared-mime-info.spec (1.53 -> 1.54) ---- Diffs: ================================================================ Index: SPECS/shared-mime-info.spec diff -u SPECS/shared-mime-info.spec:1.53 SPECS/shared-mime-info.spec:1.54 --- SPECS/shared-mime-info.spec:1.53 Sat Aug 30 04:01:10 2008 +++ SPECS/shared-mime-info.spec Sat Sep 20 01:22:23 2008 @@ -5,31 +5,26 @@ Summary: Shared MIME-info specification Summary(pl.UTF-8): Wspólna specyfikacja MIME-info Name: shared-mime-info -Version: 0.23 -Release: 3 +Version: 0.51 +Release: 1 Epoch: 1 License: GPL Group: Applications #Source0: http://freedesktop.org/software/shared-mime-info/%{name}-%{version}.tar.gz Source0: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2 -# Source0-md5: 3120a720f6a94881614b533f37a7671f -Patch0: %{name}-dtd_path.patch -Patch1: %{name}-dicom.patch -Patch2: %{name}-directory_alias_fix.patch -Patch3: %{name}-debug.patch -Patch4: %{name}-pl.patch -Patch5: %{name}-pl.po-update.patch -Patch6: %{name}-x-content.patch +# Source0-md5: 01d72161f7d88123fbccd378871f02f0 +Patch0: %{name}-pl.po-update.patch URL: http://www.freedesktop.org/wiki/Software/shared-mime-info BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-dtd412-xml BuildRequires: docbook-utils -BuildRequires: glib2-devel >= 1:2.12.2 +BuildRequires: glib2-devel >= 1:2.18.0 BuildRequires: intltool BuildRequires: libxml2-devel >= 1:2.6.26 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.311 +Requires: glib2 >= 1:2.18.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noarchpkgconfigdir /usr/share/pkgconfig @@ -85,12 +80,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build %{__intltoolize} @@ -140,15 +129,44 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.54 2008/09/19 23:22:23 megabajt +- merged from DEVEL + +Revision 1.51.2.4 2008/09/19 23:17:59 megabajt +- updated to 0.51 +- removed -directory_alias_fix.patch (nautilus seems to be fixed) +- removed -dicom.patch (applied upstream) + Revision 1.53 2008/08/30 02:01:10 glen - todos +Revision 1.51.2.3 2008/07/23 09:02:45 patrys +- 0.50 + +Revision 1.51.2.2 2008/06/30 08:45:22 patrys +- epoch 1 to follow HEAD + Revision 1.52 2008/06/30 08:41:31 patrys - reverted to 0.23 (0.40 is meant for glib2 2.17.2) - epoch 1 - rel 3 -Revision 1.49 2008/03/20 15:22:35 megabajt +Revision 1.51.2.1 2008/06/30 08:28:25 patrys +- proper glib2 deps +- moved to DEVEL + +Revision 1.51 2008/06/12 04:56:22 qboosh +- updated pl.po-update patch +- dropped debug patch, merged pl patch into pl.po-update + +Revision 1.50 2008-06-11 19:17:55 patrys +- 0.40 +- patch0 no longer relevant +- patch6 no longer needed +- disabled pl.po patches (strings differ a lot from current release) +- disabled debug.patch (not accepted upstream, either adapt od drop) + +Revision 1.49 2008-03-20 15:22:35 megabajt - added -x-content.patch - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shared-mime-info.spec?r1=1.53&r2=1.54&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
