Author: megabajt Date: Wed Mar 12 17:39:44 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.22.0 - use better way to fix locale name - use --with-omf - more verbose files
---- Files affected: SPECS: gconf-editor.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/gconf-editor.spec diff -u SPECS/gconf-editor.spec:1.48 SPECS/gconf-editor.spec:1.49 --- SPECS/gconf-editor.spec:1.48 Sun Nov 4 23:53:38 2007 +++ SPECS/gconf-editor.spec Wed Mar 12 18:39:39 2008 @@ -2,27 +2,32 @@ Summary: An editor for the GConf configuration system Summary(pl.UTF-8): Edytor do systemu konfiguracji GConf Name: gconf-editor -Version: 2.20.0 -Release: 2 +Version: 2.22.0 +Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.20/%{name}-%{version}.tar.bz2 -# Source0-md5: b686677878b5754ffa8d0a2cc1129988 -BuildRequires: GConf2-devel >= 2.18.0.1 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.22/%{name}-%{version}.tar.bz2 +# Source0-md5: 7ca99aec214dd855b5de7dacc8937055 +BuildRequires: GConf2-devel >= 2.22.0 BuildRequires: autoconf BuildRequires: automake +BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.20.0 -BuildRequires: gnome-doc-utils >= 0.10.1 -BuildRequires: gtk+2-devel >= 2:2.12.0 -BuildRequires: libgnomeui-devel >= 2.19.1 +BuildRequires: gnome-doc-utils >= 0.12.0 +BuildRequires: gtk+2-devel >= 2:2.12.8 +BuildRequires: intltool >= 0.36.2 +BuildRequires: libgnomeui-devel >= 2.22.01 BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper +BuildRequires: sed >= 4.0 Requires(post,postun): gtk+2 Requires(post,postun): hicolor-icon-theme +Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -Requires: libgnomeui >= 2.19.1 +Requires: libgnomeui >= 2.22.01 # [EMAIL PROTECTED] vs. [EMAIL PROTECTED] Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -36,13 +41,16 @@ %prep %setup -q +sed -i -e '[EMAIL PROTECTED]@latin#' po/LINGUAS +mv po/[EMAIL PROTECTED],latin}.po + %build -mkdir m4 %{__intltoolize} %{__gnome_doc_common} %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure \ --disable-scrollkeeper @@ -54,9 +62,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ - mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} -%find_lang %{name} --with-gnome +%find_lang %{name} --with-gnome --with-omf %clean rm -rf $RPM_BUILD_ROOT @@ -76,20 +82,11 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_bindir}/* -%{_desktopdir}/*.desktop +%attr(755,root,root) %{_bindir}/gconf-editor +%{_desktopdir}/gconf-editor.desktop %{_iconsdir}/hicolor/*/*/*.png -%{_mandir}/man1/* -%{_pixmapsdir}/* -%dir %{_omf_dest_dir}/%{name} -%{_omf_dest_dir}/gconf-editor/gconf-editor-C.omf -%lang(de) %{_omf_dest_dir}/gconf-editor/gconf-editor-de.omf -%lang(es) %{_omf_dest_dir}/gconf-editor/gconf-editor-es.omf -%lang(fr) %{_omf_dest_dir}/gconf-editor/gconf-editor-fr.omf -%lang(it) %{_omf_dest_dir}/gconf-editor/gconf-editor-it.omf -%lang(oc) %{_omf_dest_dir}/gconf-editor/gconf-editor-oc.omf -%lang(sv) %{_omf_dest_dir}/gconf-editor/gconf-editor-sv.omf -%lang(uk) %{_omf_dest_dir}/gconf-editor/gconf-editor-uk.omf +%{_mandir}/man1/gconf-editor.1* +%{_pixmapsdir}/gconf-editor %{_sysconfdir}/gconf/schemas/gconf-editor.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -98,6 +95,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2008-03-12 17:39:39 megabajt +- updated to 2.22.0 +- use better way to fix locale name +- use --with-omf +- more verbose files + Revision 1.48 2007-11-04 22:53:38 ankry - [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2 @@ -318,5 +321,3 @@ Revision 1.2 2002/05/21 13:02:06 qboosh - partial cleanup -* Tue Apr 30 2002 Frederic Crozat <[EMAIL PROTECTED]> 0.1-1mdk -- Initial Mandrake package (GNOME 2) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gconf-editor.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
