diff commited package against linked revision 4cc2c7faf98ff57a76039b35d1524928 Index: conglomerate-desktop.patch =================================================================== --- conglomerate-desktop.patch (revision 4cc2c7faf98ff57a76039b35d1524928) +++ conglomerate-desktop.patch (revision 90d10d90b863d73c2aa826994024e192) @@ -1,6 +1,8 @@ ---- conglomerate-0.7.16/data/conglomerate.desktop.in.~1~ 2004-11-04 00:58:12.000000000 +0100 -+++ conglomerate-0.7.16/data/conglomerate.desktop.in 2004-11-22 13:50:06.769498924 +0100 -@@ -4,8 +4,9 @@ +Index: conglomerate-0.9.1/data/conglomerate.desktop.in +=================================================================== +--- conglomerate-0.9.1.orig/data/conglomerate.desktop.in ++++ conglomerate-0.9.1/data/conglomerate.desktop.in +@@ -4,8 +4,9 @@ _Name=Conglomerate XML Editor _Comment=Edit XML files TryExec=conglomerate Exec=conglomerate %U @@ -12,23 +14,4 @@ +GenericName=Conglomerate XML Editor +Categories=GNOME;Utility;TextEditor; MimeType=text/xml;text/x-dtd;text/x-xds; ---- conglomerate-0.7.16/data/conglomerate.desktop.~1~ 2004-11-04 05:43:05.000000000 +0100 -+++ conglomerate-0.7.16/data/conglomerate.desktop 2004-11-22 13:50:35.098964610 +0100 -@@ -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 -@@ -50,8 +51,8 @@ - Comment[sv]=Redigera XML-filer - 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; +Index: conglomerate-0.9.1/data/conglomerate.desktop Index: conglomerate.changes =================================================================== --- conglomerate.changes (revision 4cc2c7faf98ff57a76039b35d1524928) +++ conglomerate.changes (revision 90d10d90b863d73c2aa826994024e192) @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Sep 7 18:11:11 CEST 2011 - sbrabec@suse.cz + +- 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. + +------------------------------------------------------------------- Wed Oct 15 19:56:31 CDT 2008 - maw@novell.com - Run intltoolize. Index: conglomerate.spec =================================================================== --- conglomerate.spec (revision 4cc2c7faf98ff57a76039b35d1524928) +++ conglomerate.spec (revision 90d10d90b863d73c2aa826994024e192) @@ -19,7 +19,7 @@ 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: 281 @@ -29,6 +29,7 @@ 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 @@ -64,10 +65,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. Index: conglomerate-dist.patch =================================================================== --- conglomerate-dist.patch (added) +++ conglomerate-dist.patch (revision 90d10d90b863d73c2aa826994024e192) @@ -0,0 +1,47 @@ +--- 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 @@ ++ ++ ++ ++ /schemas/apps/conglomerate/custom-dispspec-paths ++ /apps/conglomerate/custom-dispspec-paths ++ conglomerate ++ list ++ string ++ [~/.conglomerate/dispspecs] ++ ++ Custom locations for display specification files. ++ 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. ++ ++ ++ ++ /schemas/apps/conglomerate/plugins/templates/template-paths ++ /apps/conglomerate/plugins/templates/template-paths ++ conglomerate ++ list ++ string ++ [~/.conglomerate/templates] ++ ++ Locations for template files. ++ 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. ++ ++ ++ ++ ++