Hello community, here is the log from the commit of package conglomerate for openSUSE:Factory checked in at Thu Feb 24 14:55:21 CET 2011.
-------- --- GNOME/conglomerate/conglomerate.changes 2011-02-12 20:23:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/conglomerate/conglomerate.changes 2011-02-24 14:18:05.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 14 16:37:40 CET 2011 - [email protected] + +- Added support for translation-update-upstream. +- Added source file for conglomerate.schemas, removed generated + files from "make dist" to ensure that latest translation files + are used in the build. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- conglomerate-dist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conglomerate.spec ++++++ --- /var/tmp/diff_new_pack.b2WGak/_old 2011-02-24 14:54:56.000000000 +0100 +++ /var/tmp/diff_new_pack.b2WGak/_new 2011-02-24 14:54:56.000000000 +0100 @@ -19,16 +19,17 @@ Name: conglomerate -BuildRequires: enchant-devel fdupes gnutls-devel gtk-doc gtksourceview18-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel perl-XML-Parser scrollkeeper sgml-skel shared-mime-info update-desktop-files +BuildRequires: enchant-devel fdupes gnutls-devel gtk-doc gtksourceview18-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel perl-XML-Parser scrollkeeper sgml-skel shared-mime-info translation-update-upstream update-desktop-files Summary: XML Editor for GNOME Version: 0.9.1 -Release: 291 +Release: 296 Recommends: %{name}-lang Group: Productivity/Publishing/XML License: GPLv2+ Url: http://www.conglomerate.org/ Source0: %{name}-%{version}.tar.bz2 Patch: conglomerate-desktop.patch +Patch1: conglomerate-dist.patch Patch2: conglomerate-readme-xds.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -52,10 +53,13 @@ %lang_package %prep %setup -q -%patch -p 1 -%patch2 rename no nb po/no.* sed -i "/^ALL_LINGUAS/s/ no / nb /" configure.in +%patch1 +rm data/conglomerate.keys data/conglomerate.desktop data/conglomerate.schemas +translation-update-upstream +%patch -p 1 +%patch2 %build # - Add enchant and enchant-devel to neededforbuild. ++++++ conglomerate-desktop.patch ++++++ --- /var/tmp/diff_new_pack.b2WGak/_old 2011-02-24 14:54:56.000000000 +0100 +++ /var/tmp/diff_new_pack.b2WGak/_new 2011-02-24 14:54:56.000000000 +0100 @@ -15,24 +15,3 @@ +Categories=GNOME;Utility;TextEditor; MimeType=text/xml;text/x-dtd;text/x-xds; Index: conglomerate-0.9.1/data/conglomerate.desktop -=================================================================== ---- conglomerate-0.9.1.orig/data/conglomerate.desktop -+++ conglomerate-0.9.1/data/conglomerate.desktop -@@ -1,5 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 -+GenericName=Conglomerate XML Editor - Name=Conglomerate XML Editor - Name[az]=Conglomerate XML Editoru - Name[ca]=Editor XML Conglomerate -@@ -54,8 +55,8 @@ Comment[uk]=Редактор файлі� - Comment[zh_CN]=编辑 XML 文件 - TryExec=conglomerate - Exec=conglomerate %U --Icon=conglomerate-icon-16.png -+Icon=conglomerate-icon-16 - Terminal=false - Type=Application --Categories=GNOME;Application;Office;TextEditor; -+Categories=GNOME;Utility;TextEditor; - MimeType=text/xml;text/x-dtd;text/x-xds; ++++++ conglomerate-dist.patch ++++++ --- data/Makefile.am +++ data/Makefile.am @@ -34,11 +34,9 @@ install-schemas: $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) EXTRA_DIST = $(desktop_in_files) \ - $(desktop_DATA) \ $(keys_in_files) \ - $(keys_DATA) \ $(mime_DATA) \ $(app_DATA) \ $(stylesheet_DATA) \ $(css_DATA) \ - $(schema_DATA) + $(schema_in_files) --- /dev/null +++ data/conglomerate.schemas.in @@ -0,0 +1,29 @@ +<gconfschemafile> + <schemalist> + <schema> + <key>/schemas/apps/conglomerate/custom-dispspec-paths</key> + <applyto>/apps/conglomerate/custom-dispspec-paths</applyto> + <owner>conglomerate</owner> + <type>list</type> + <list_type>string</list_type> + <default>[~/.conglomerate/dispspecs]</default> + <locale name="C"> + <short>Custom locations for display specification files.</short> + <long>A list of custom directories where Conglomerate should look for the display specification (called dispspec, or .xds) files, in addition to the standard installation path. When documents are loaded a matching dispspec is searched for in these directories, and the first matching dispspec file is used.</long> + </locale> + </schema> + <schema> + <key>/schemas/apps/conglomerate/plugins/templates/template-paths</key> + <applyto>/apps/conglomerate/plugins/templates/template-paths</applyto> + <owner>conglomerate</owner> + <type>list</type> + <list_type>string</list_type> + <default>[~/.conglomerate/templates]</default> + <locale name="C"> + <short>Locations for template files.</short> + <long>A list of directories where Conglomerate should look for template xml files. These documents will be used by the new document assistant as types of documents which can be created by the user.</long> + </locale> + </schema> + + </schemalist> +</gconfschemafile> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
