SPECS (AC-branch): gnome-utils.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 19:03:34 CEST 2006


Author: baggins                      Date: Mon May 15 17:03:34 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-utils.spec (1.132 -> 1.132.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-utils.spec
diff -u SPECS/gnome-utils.spec:1.132 SPECS/gnome-utils.spec:1.132.2.1
--- SPECS/gnome-utils.spec:1.132	Mon Nov 28 19:26:46 2005
+++ SPECS/gnome-utils.spec	Mon May 15 19:03:28 2006
@@ -6,30 +6,29 @@
 Summary(uk):	őÔÉĚŚÔÉ GNOME, ÔÁËŚ ŃË ĐĎŰŐË ĆÁĘĚŚ× ÔÁ ËÁĚŘËŐĚŃÔĎŇ
 Summary(zh_CN):	GNOMEÓŚÓĂłĚĐňźŻ
 Name:		gnome-utils
-Version:	2.12.2
+Version:	2.14.0
 Release:	1
 Epoch:		1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	71d615932e4ddf7182abeb734b8e370c
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	d1d16ff6bfc1f6ddc110d18ec4dfdbfa
 Patch0:		%{name}-desktop.patch
-Icon:		gnome-utils.xpm
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.10.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gnome-common >= 2.8.0-2
-BuildRequires:	gnome-desktop-devel >= 2.10.0-2
-BuildRequires:	gnome-panel-devel >= 2.10.0-2
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-desktop-devel >= 2.14.0
+BuildRequires:	gnome-panel-devel >= 2.14.0
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
 BuildRequires:	hal-devel >= 0.4.7
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
 BuildRequires:	libgnomeprintui-devel >= 2.10.2
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
@@ -38,7 +37,7 @@
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
-Requires:	gnome-vfs2 >= 2.10.0-2
+Requires:	gnome-vfs2 >= 2.14.0
 Requires:	gtk+2 >= 2:2.6.4
 Obsoletes:	gnome
 Obsoletes:	gnome-admin
@@ -71,20 +70,56 @@
 ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÄĹŃËŚ ŐÔÉĚŚÔÉ ÄĚŃ GNOME, ÔÁËŚ ŃË ŚÎÓÔŇŐÍĹÎÔ ÄĚŃ
 ĐĎŰŐËŐ ĆÁĘĚŚ×, ËÁĚŘËŐĚŃÔĎŇ, ŇĹÄÁËÔĎŇ 16-ËĎ×ĎÇĎ ËĎÄŐ, ÔĎÝĎ.
 
-%package dict
+%package -n libgdict
+Summary:	libgdict library
+Summary(pl):	Biblioteka libgdict
+Group:		Libraries
+
+%description -n libgdict
+libgdict library.
+
+%description -n libgdict -l pl
+Biblioteka libgdict.
+
+%package -n libgdict-devel
+Summary:	Header files for libgdict library
+Summary(pl):	Pliki nagłówkowe biblioteki libgdict
+Group:		Development/Libraries
+Requires:	libgdict = %{epoch}:%{version}-%{release}
+
+%description -n libgdict-devel
+This is the package containing the header files for libgdict library.
+
+%description -n libgdict-devel -l pl
+Ten pakiet zawiera pliki nagłówkowe biblioteki libgdict.
+
+%package -n libgdict-static
+Summary:	Static libgdict library
+Summary(pl):	Statyczna biblioteka libgdict
+Group:		Development/Libraries
+Requires:	libgdict-devel = %{epoch}:%{version}-%{release}
+
+%description -n libgdict-static
+Static libgdict library.
+
+%description -n libgdict-static -l pl
+Statyczna biblioteka libgdict.
+
+%package dictionary
 Summary:	Online dictionary
 Summary(pl):	Słownik online
 Group:		X11/Applications/Multimedia
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	gnome-dict
 Conflicts:	gnome-utils <= 0:2.10.0-1
 
-%description dict
+%description dictionary
 Allows to look up an online dictionary for definitions and correct
 spellings of words.
 
-%description dict -l pl
+%description dictionary -l pl
 Pozwala na wyszukiwanie definicji i poprawnej pisowni słów w słowniku
 sieciowym.
 
@@ -154,13 +189,16 @@
 %patch0 -p1
 
 %build
+%{__intltoolize}
 %{__gnome_doc_common}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--disable-scrollkeeper \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -170,8 +208,6 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name}-2.0
 %find_lang gfloppy --with-gnome
 %find_lang gnome-dictionary --with-gnome
@@ -181,14 +217,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post dict
+%post   -n libgdict -p /sbin/ldconfig
+%postun -n libgdict -p /sbin/ldconfig
+
+%post dictionary
 %scrollkeeper_update_post
-%gconf_schema_install gdict.schemas
+%gconf_schema_install gnome-dictionary.schemas
 
-%preun dict
-%gconf_schema_uninstall gdict.schemas
+%preun dictionary
+%gconf_schema_uninstall gnome-dictionary.schemas
 
-%postun dict
+%postun dictionary
 %scrollkeeper_update_postun
 
 %post floppy
@@ -234,21 +273,38 @@
 %doc AUTHORS ChangeLog NEWS README
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/glade
-%dir %{_omf_dest_dir}/%{name}
 
-%files dict -f gnome-dictionary.lang
+%files -n libgdict
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgdict-1.0.so.*.*.*
+%{_datadir}/gdict-1.0
+
+%files -n libgdict-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgdict-1.0.so
+%{_libdir}/libgdict-1.0.la
+%{_gtkdocdir}/gdict
+%{_includedir}/gdict-1.0
+%{_pkgconfigdir}/gdict-1.0.pc
+
+%files -n libgdict-static
 %defattr(644,root,root,755)
-%doc gdictsrc/ChangeLog gdictsrc/README
+%{_libdir}/libgdict-1.0.a
+
+%files dictionary -f gnome-dictionary.lang
+%defattr(644,root,root,755)
+%doc gnome-dictionary/ChangeLog gnome-dictionary/README gnome-dictionary/TODO
 %attr(755,root,root) %{_bindir}/gnome-dictionary
-%attr(755,root,root) %{_libdir}/gdict-applet
-%{_sysconfdir}/gconf/schemas/gdict.schemas
+%attr(755,root,root) %{_libdir}/gnome-dictionary-applet
+%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
 %{_desktopdir}/gnome-dictionary.desktop
 %{_libdir}/bonobo/servers/*
 %{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome-dictionary
 %{_mandir}/man1/gnome-dictionary*
-%{_omf_dest_dir}/%{name}/gnome-dictionary-C.omf
-%lang(ja) %{_omf_dest_dir}/%{name}/gnome-dictionary-ja.omf
-%lang(uk) %{_omf_dest_dir}/%{name}/gnome-dictionary-uk.omf
+%{_pixmapsdir}/gnome-dictionary.png
+%{_omf_dest_dir}/gnome-dictionary/gnome-dictionary-C.omf
+%lang(es) %{_omf_dest_dir}/gnome-dictionary/gnome-dictionary-es.omf
 
 %files floppy -f gfloppy.lang
 %defattr(644,root,root,755)
@@ -258,10 +314,7 @@
 %{_desktopdir}/gfloppy.desktop
 %{_datadir}/%{name}/glade/gfloppy2.glade
 %{_mandir}/man1/gfloppy*
-%{_omf_dest_dir}/%{name}/gfloppy-C.omf
-%lang(ja) %{_omf_dest_dir}/%{name}/gfloppy-ja.omf
-%lang(nl) %{_omf_dest_dir}/%{name}/gfloppy-nl.omf
-%lang(uk) %{_omf_dest_dir}/%{name}/gfloppy-uk.omf
+%{_omf_dest_dir}/gfloppy/gfloppy-C.omf
 
 %files logview -f gnome-system-log.lang
 %defattr(644,root,root,755)
@@ -271,17 +324,8 @@
 %{_desktopdir}/gnome-system-log.desktop
 %{_datadir}/gnome-system-log
 %{_mandir}/man1/gnome-system-log*
-%{_omf_dest_dir}/%{name}/gnome-system-log-C.omf
-%lang(de) %{_omf_dest_dir}/%{name}/gnome-system-log-de.omf
-%lang(es) %{_omf_dest_dir}/%{name}/gnome-system-log-es.omf
-%lang(fr) %{_omf_dest_dir}/%{name}/gnome-system-log-fr.omf
-%lang(it) %{_omf_dest_dir}/%{name}/gnome-system-log-it.omf
-%lang(ja) %{_omf_dest_dir}/%{name}/gnome-system-log-ja.omf
-%lang(ko) %{_omf_dest_dir}/%{name}/gnome-system-log-ko.omf
-%lang(sv) %{_omf_dest_dir}/%{name}/gnome-system-log-sv.omf
-%lang(uk) %{_omf_dest_dir}/%{name}/gnome-system-log-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/%{name}/gnome-system-log-zh_CN.omf
-%lang(zh_TW) %{_omf_dest_dir}/%{name}/gnome-system-log-zh_TW.omf
+%{_omf_dest_dir}/gnome-system-log/gnome-system-log-C.omf
+%lang(es) %{_omf_dest_dir}/gnome-system-log/gnome-system-log-es.omf
 
 %files search-tool -f gnome-search-tool.lang
 %defattr(644,root,root,755)
@@ -291,26 +335,19 @@
 %{_desktopdir}/gnome-search-tool.desktop
 %{_datadir}/%{name}
 %{_mandir}/man1/gnome-search-tool*
-%{_omf_dest_dir}/%{name}/gnome-search-tool-C.omf
 %{_pixmapsdir}/gsearchtool
-%lang(es) %{_omf_dest_dir}/%{name}/gnome-search-tool-es.omf
-%lang(fr) %{_omf_dest_dir}/%{name}/gnome-search-tool-fr.omf
-%lang(it) %{_omf_dest_dir}/%{name}/gnome-search-tool-it.omf
-%lang(ja) %{_omf_dest_dir}/%{name}/gnome-search-tool-ja.omf
-%lang(ko) %{_omf_dest_dir}/%{name}/gnome-search-tool-ko.omf
-%lang(sv) %{_omf_dest_dir}/%{name}/gnome-search-tool-sv.omf
-%lang(uk) %{_omf_dest_dir}/%{name}/gnome-search-tool-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/%{name}/gnome-search-tool-zh_CN.omf
-%lang(zh_HK) %{_omf_dest_dir}/%{name}/gnome-search-tool-zh_HK.omf
-%lang(zh_TW) %{_omf_dest_dir}/%{name}/gnome-search-tool-zh_TW.omf
+%{_omf_dest_dir}/gnome-search-tool/gnome-search-tool-C.omf
+%lang(es) %{_omf_dest_dir}/gnome-search-tool/gnome-search-tool-es.omf
+%lang(it) %{_omf_dest_dir}/gnome-search-tool/gnome-search-tool-it.omf
 
 %files screenshot
 %defattr(644,root,root,755)
 %doc gnome-screenshot/ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-panel-screenshot
 %attr(755,root,root) %{_bindir}/gnome-screenshot
-%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_datadir}/gnome-screenshot
+%{_desktopdir}/gnome-screenshot.desktop
+%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -318,6 +355,36 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132.2.1  2006/05/15 17:03:28  baggins
+- merged from HEAD
+
+Revision 1.134  2006/04/02 14:37:48  freetz
+- merged from DEVEL
+
+Revision 1.133.2.7  2006/03/13 14:32:41  freetz
+- 2.14.0
+
+Revision 1.133.2.6  2006/03/04 08:00:16  freetz
+- 2.13.95
+
+Revision 1.133.2.5  2006/02/25 09:20:22  freetz
+- 2.13.93
+
+Revision 1.133.2.4  2006/02/12 18:19:59  freetz
+- 2.13.92
+
+Revision 1.133.2.3  2006/01/30 23:29:38  freetz
+- oops
+
+Revision 1.133.2.2  2006/01/30 18:18:07  freetz
+- removed bogus Requires, smashed white spaces
+
+Revision 1.133.2.1  2006/01/30 17:53:00  freetz
+- 2.13.91, libgdict added
+
+Revision 1.133  2006/01/21 00:01:16  arekm
+- kill Icon: field (support for these is obsolete says jbj)
+
 Revision 1.132  2005/11/28 18:26:46  freetz
 - dropped omf patch - fixed in sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.132&r2=1.132.2.1&f=u



More information about the pld-cvs-commit mailing list