October 2013 - openSUSE Commits - openSUSE Mailing Lists

commit file-roller for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package file-roller for openSUSE:Factory checked in at 2013-10-01 08:11:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file-roller (Old) and /work/SRC/openSUSE:Factory/.file-roller.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "file-roller" Changes: -------- --- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2013-09-27 17:09:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes 2013-10-01 08:11:52.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Sep 29 13:06:25 UTC 2013 - zaitor(a)opensuse.org + +- Add file-roller-fix-tar-extraction.patch, fixes untaring that + failed on some tar files (bgo#697756, bgo#709035). +- Remove V=1 from make as it only fills up the obs buildlog to no + use, debugging is done locally anyway. +- Add lzip and lzop to suggested packages, as these are now + available in openSUSE. +- Stop passing --disable-scrollkeeper to configure, neither + recognized nor needed anymore. +- Remove %if conditional for obsolete versions of openSUSE, those + are out of support a long time ago. + +------------------------------------------------------------------- New: ---- file-roller-fix-tar-extraction.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file-roller.spec ++++++ --- /var/tmp/diff_new_pack.oJfSrB/_old 2013-10-01 08:11:52.000000000 +0200 +++ /var/tmp/diff_new_pack.oJfSrB/_new 2013-10-01 08:11:52.000000000 +0200 @@ -28,6 +28,8 @@ Patch0: file-roller-3.4-change-archiver-priority.patch # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar(a)opensuse.org -- List package match names for automatic installation using PK. Patch1: file-roller-pkg-match.patch +# PATCH-FIX-UPSTREAM file-roller-fix-tar-extraction.patch bgo#697756, bgo#709035 zaitor(a)opensuse.org -- Fix untaring of that failed for tar files. Taken from upstream git. +Patch2: file-roller-fix-tar-extraction.patch # Needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -59,6 +61,8 @@ Recommends: zip # Additional formats that are supported Suggests: lha +Suggests: lzip +Suggests: lzop Suggests: rzip Suggests: zoo BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,8 +71,6 @@ # we could package. #Suggests: arj #Suggests: lrzip -#Suggests: lzip -#Suggests: lzop #Suggests: ncompress #Suggests: rar #Suggests: theunarchiver @@ -100,19 +102,16 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 translation-update-upstream %build %configure\ - --disable-scrollkeeper \ --enable-magic -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install %make_install -%if 0%{?suse_version} <= 1120 -rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif %suse_update_desktop_file %{name} %find_lang %{name} %{?no_lang_C} rm %{buildroot}%{_libdir}/*/*/*.*a ++++++ file-roller-fix-tar-extraction.patch ++++++ >From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <paobac(a)src.gnome.org> Date: Sun, 29 Sep 2013 16:30:29 +0000 Subject: libarchive: fixed failure when extracting some tar archives do not try to restore the creation time; do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute [bug #709035] --- diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c index 42673df..44aaad2 100644 --- a/src/fr-archive-libarchive.c +++ b/src/fr-archive-libarchive.c @@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry, /* times */ - if (archive_entry_ctime_is_set (entry)) { - g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry)); - g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry)); - } - - if (archive_entry_mtime_is_set (entry)) { + if (archive_entry_mtime_is_set (entry)) g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry)); - g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry)); - } /* username */ @@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders, info = g_file_info_new (); g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); - g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); + if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET) + g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); result = _g_file_set_attributes_from_info (file, info, cancellable, error); g_object_unref (info); -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit etherape for openSUSE:13.1
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package etherape for openSUSE:13.1 checked in at 2013-10-01 08:11:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/etherape (Old) and /work/SRC/openSUSE:13.1/.etherape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "etherape" Changes: -------- --- /work/SRC/openSUSE:13.1/etherape/etherape.changes 2013-09-23 10:50:37.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.etherape.new/etherape.changes 2013-10-01 08:11:21.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Sep 29 21:23:05 UTC 2013 - zaitor(a)opensuse.org + +- Add scrollkeeps BuildRequires, needed now due to changes made in + gnome-doc-utils-devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etherape.spec ++++++ --- /var/tmp/diff_new_pack.bhPeir/_old 2013-10-01 08:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.bhPeir/_new 2013-10-01 08:11:21.000000000 +0200 @@ -33,6 +33,7 @@ BuildRequires: libgnomeui-devel BuildRequires: libpcap-devel BuildRequires: pkgconfig +BuildRequires: scrollkeeper BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit etherape for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package etherape for openSUSE:Factory checked in at 2013-10-01 08:11:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/etherape (Old) and /work/SRC/openSUSE:Factory/.etherape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "etherape" Changes: -------- --- /work/SRC/openSUSE:Factory/etherape/etherape.changes 2011-09-23 01:56:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.etherape.new/etherape.changes 2013-10-01 08:11:19.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Sep 29 21:23:05 UTC 2013 - zaitor(a)opensuse.org + +- Add scrollkeeps BuildRequires, needed now due to changes made in + gnome-doc-utils-devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etherape.spec ++++++ --- /var/tmp/diff_new_pack.A1gH3a/_old 2013-10-01 08:11:20.000000000 +0200 +++ /var/tmp/diff_new_pack.A1gH3a/_new 2013-10-01 08:11:20.000000000 +0200 @@ -33,6 +33,7 @@ BuildRequires: libgnomeui-devel BuildRequires: libpcap-devel BuildRequires: pkgconfig +BuildRequires: scrollkeeper BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit easytag for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package easytag for openSUSE:Factory checked in at 2013-10-01 08:11:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/easytag (Old) and /work/SRC/openSUSE:Factory/.easytag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "easytag" Changes: -------- --- /work/SRC/openSUSE:Factory/easytag/easytag.changes 2013-03-12 17:13:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.easytag.new/easytag.changes 2013-10-01 08:11:09.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 30 02:36:35 UTC 2013 - malcolmlewis(a)opensuse.org + +- Add easytag-remove-deprecated-x-directory.patch: Remove + deprecated x-directory/normal from .desktop. +- Add update desktop file build macros and build requires to spec + file. + +------------------------------------------------------------------- New: ---- easytag-remove-deprecated-x-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ easytag.spec ++++++ --- /var/tmp/diff_new_pack.JWkG4E/_old 2013-10-01 08:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.JWkG4E/_new 2013-10-01 08:11:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package +# spec file for package easytag # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,19 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: easytag Version: 2.1.8 Release: 0 -License: GPL-2.0+ Summary: GTK+ tag editor for audio files -Url: http://projects.gnome.org/easytag/ +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities +Url: http://projects.gnome.org/easytag/ Source: http://ftp.acc.umu.se/pub/GNOME/sources/easytag/2.1/easytag-2.1.8.tar.xz # PATCH-FIX-UPSTREAM easytag-mixed-declarations.patch dimstar(a)opensuse.org -- Fix mixed declarations build failure. Taken from git. Patch0: easytag-mixed-declarations.patch # PATCH-FIX-UPSTREAM easytag-nodatetime.patch bgo#695322 dimstar(a)opensuse.org -- Do not add __DATE__ and __TIME__ into the binaries. Patch1: easytag-nodatetime.patch +# PATCH-FIX-UPSTREAM easytag-remove-deprecated-x-directory.patch amigadave(a)amigadave.com -- Remove deprecated x-directory/normal from .desktop +Patch2: easytag-remove-deprecated-x-directory.patch BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: id3lib-devel BuildRequires: intltool >= 0.50.0 BuildRequires: pkg-config >= 0.24 @@ -41,6 +45,7 @@ BuildRequires: pkgconfig(vorbis) >= 1.0.1 BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) >= 4.40 +BuildRequires: update-desktop-files Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +60,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure @@ -62,10 +68,17 @@ %install %make_install +%suse_update_desktop_file %{name} %find_lang %{name} # We take the HACKERS and AUTHORS file to the standard package doc rm -rf %{buildroot}%{_datadir}/doc +%post +%desktop_database_post + +%postun +%desktop_database_postun + %files %defattr(-,root,root) %doc ChangeLog README COPYING HACKING THANKS TODO ++++++ easytag-remove-deprecated-x-directory.patch ++++++ >From dc377f9ac5dec9a317afa5c598681e8f41b6cf4f Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Thu, 21 Feb 2013 16:41:39 +0000 Subject: Remove deprecated x-directory/normal from .desktop It causes desktop-file-validate to emit a warning, and is already covered by inode/directory. --- diff --git a/easytag.desktop.in b/easytag.desktop.in index a52f2ef..8146928 100644 --- a/easytag.desktop.in +++ b/easytag.desktop.in @@ -6,7 +6,7 @@ _Keywords=mp3;tag;audio; Type=Application Icon=easytag Categories=GTK;AudioVideo;AudioVideoEditing; -MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; +MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; Exec=easytag %F Terminal=false StartupNotify=true -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit easytag for openSUSE:13.1
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package easytag for openSUSE:13.1 checked in at 2013-10-01 08:11:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/easytag (Old) and /work/SRC/openSUSE:13.1/.easytag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "easytag" Changes: -------- --- /work/SRC/openSUSE:13.1/easytag/easytag.changes 2013-09-23 10:50:14.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.easytag.new/easytag.changes 2013-10-01 08:11:10.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 30 02:36:35 UTC 2013 - malcolmlewis(a)opensuse.org + +- Add easytag-remove-deprecated-x-directory.patch: Remove + deprecated x-directory/normal from .desktop. +- Add update desktop file build macros and build requires to spec + file. + +------------------------------------------------------------------- New: ---- easytag-remove-deprecated-x-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ easytag.spec ++++++ --- /var/tmp/diff_new_pack.TKMDWi/_old 2013-10-01 08:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.TKMDWi/_new 2013-10-01 08:11:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package +# spec file for package easytag # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,19 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: easytag Version: 2.1.8 Release: 0 -License: GPL-2.0+ Summary: GTK+ tag editor for audio files -Url: http://projects.gnome.org/easytag/ +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities +Url: http://projects.gnome.org/easytag/ Source: http://ftp.acc.umu.se/pub/GNOME/sources/easytag/2.1/easytag-2.1.8.tar.xz # PATCH-FIX-UPSTREAM easytag-mixed-declarations.patch dimstar(a)opensuse.org -- Fix mixed declarations build failure. Taken from git. Patch0: easytag-mixed-declarations.patch # PATCH-FIX-UPSTREAM easytag-nodatetime.patch bgo#695322 dimstar(a)opensuse.org -- Do not add __DATE__ and __TIME__ into the binaries. Patch1: easytag-nodatetime.patch +# PATCH-FIX-UPSTREAM easytag-remove-deprecated-x-directory.patch amigadave(a)amigadave.com -- Remove deprecated x-directory/normal from .desktop +Patch2: easytag-remove-deprecated-x-directory.patch BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: id3lib-devel BuildRequires: intltool >= 0.50.0 BuildRequires: pkg-config >= 0.24 @@ -41,6 +45,7 @@ BuildRequires: pkgconfig(vorbis) >= 1.0.1 BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) >= 4.40 +BuildRequires: update-desktop-files Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +60,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure @@ -62,10 +68,17 @@ %install %make_install +%suse_update_desktop_file %{name} %find_lang %{name} # We take the HACKERS and AUTHORS file to the standard package doc rm -rf %{buildroot}%{_datadir}/doc +%post +%desktop_database_post + +%postun +%desktop_database_postun + %files %defattr(-,root,root) %doc ChangeLog README COPYING HACKING THANKS TODO ++++++ easytag-remove-deprecated-x-directory.patch ++++++ >From dc377f9ac5dec9a317afa5c598681e8f41b6cf4f Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Thu, 21 Feb 2013 16:41:39 +0000 Subject: Remove deprecated x-directory/normal from .desktop It causes desktop-file-validate to emit a warning, and is already covered by inode/directory. --- diff --git a/easytag.desktop.in b/easytag.desktop.in index a52f2ef..8146928 100644 --- a/easytag.desktop.in +++ b/easytag.desktop.in @@ -6,7 +6,7 @@ _Keywords=mp3;tag;audio; Type=Application Icon=easytag Categories=GTK;AudioVideo;AudioVideoEditing; -MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; +MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; Exec=easytag %F Terminal=false StartupNotify=true -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit docbook-xsl-stylesheets for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at 2013-10-01 08:10:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docbook-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2013-07-11 13:27:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes 2013-10-01 08:10:49.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 23 13:51:41 UTC 2013 - toms(a)opensuse.org + +- Moved installation procedure into dbxslt-install.sh Shell script + +------------------------------------------------------------------- New: ---- dbxslt-install.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.ovAQmj/_old 2013-10-01 08:11:01.000000000 +0200 +++ /var/tmp/diff_new_pack.ovAQmj/_new 2013-10-01 08:11:01.000000000 +0200 @@ -29,6 +29,7 @@ BuildRequires: fdupes BuildRequires: sgml-skel BuildRequires: unzip +# BuildRequires: dos2unix BuildArch: noarch Requires: docbook_4 Requires: xmlcharent @@ -37,6 +38,7 @@ Release: 0 Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}… Source1: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{vers… +Source10: dbxslt-install.sh Patch0: %{name}-dbtoepub.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/docbook/ @@ -78,69 +80,29 @@ %prep %setup -q -n docbook-xsl-%{version} -b1 %patch0 -p1 +cp %{S:10} . #-------------------------------------------------------------------------- %build - # -# Creating catalog entries # +find slides -regex ".*\.$xml\|htc\|\|hu\|js\|svg\|css\|html\.*\|txt\|rnc\|xhtml$" \ + -exec sed -i 's/\r//' {} \; + +# Fix wrong end-of-line encoding +sed -i 's/\r//' params/* # -# /etc/xml/docbook-xsl-stylesheets.xml -# -%{xmlcatalog} --noout --create %{dbstyle_catalog} -%{xmlcatalog} --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} -%{xmlcatalog} --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} -%{xmlcatalog} --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} -%{xmlcatalog} --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} - -# -# temporary file that is added to /etc/xml/suse-catalog.xml -# during post -# -%{xmlcatalog} --noout --create %{dbstyle_catalog_entry} -%{xmlcatalog} --noout --add "delegateSystem" \ - "http://docbook.sourceforge.net/release/xsl/" \ - "file:///etc/xml/%{dbstyle_catalog}" %{dbstyle_catalog_entry} -%__sed -i -e '/<catalog/a\ <group id="%{name}">' \ - -e '/<\/catalog/i\ </group>' %{dbstyle_catalog_entry} +find -type f -exec chmod 644 {} \; +find -type d -exec chmod 755 {} \; +chmod 755 extensions/xslt.py #-------------------------------------------------------------------------- %install -# Create directories -%__mkdir_p -m755 %{buildroot}%{_bindir} -%__mkdir_p -m755 %{buildroot}%{dbstyle_dir}/%{version} -%__mkdir_p -m755 %{buildroot}%{_defaultdocdir}/%{name}/html -%__mkdir_p -m755 %{buildroot}%{_sysconfdir}/xml - -# Install scripts -%__install -m755 fo/pdf2index %{buildroot}%{_bindir} -%__install -m755 epub/bin/dbtoepub %{buildroot}%{_bindir} -%__install -m755 slides/images/callouts/gen.sh %{buildroot}%{_bindir}/callout-gen -rm slides/images/callouts/gen.sh - -# VERSION.xsl -%__install -m644 VERSION.xsl %{buildroot}%{dbstyle_dir}/%{version} - -# all the rest is located in subdirectories, exclude some subdirectories with -# stuff not needed -for DIR in $(find -maxdepth 1 -mindepth 1 -type d $ -name "tools" -o -name "doc" -o -name "docsrc" -o -name "tests" $ -prune -o -type d -print ); do - %__tar c $DIR | (cd %{buildroot}%{dbstyle_dir}/%{version}; %__tar xp); -done +sh ./dbxslt-install.sh --package-version=%{version} --buildroot=%{buildroot} + # fixing permission errors from sources -find %{buildroot}%{dbstyle_dir}/%{version} -type f -exec %__chmod 644 {} \; -find %{buildroot}%{dbstyle_dir}/%{version} -type d -exec %__chmod 755 {} \; -%__chmod 755 %{buildroot}%{dbstyle_dir}/%{version}/extensions/xslt.py # create current link # but not for snapshots @@ -151,13 +113,7 @@ popd >/dev/null fi -# install the catalog files -# -%__install -m644 %{dbstyle_catalog} %{buildroot}%{_sysconfdir}/xml -%__install -m644 %{dbstyle_catalog_entry} %{buildroot}%{_sysconfdir}/xml - # the docs come last -# %__tar c -C doc . | (cd %{buildroot}%{_defaultdocdir}/%{name}/html; %__tar xp); %fdupes -s %{buildroot} @@ -203,6 +159,7 @@ %exclude %{dbstyle_dir}/%{version}/slides/slidy/.htaccess %exclude %{dbstyle_dir}/%{version}/slides/slidy/*/.htaccess +# %%exclude %%{dbstyle_dir}/svn-commit.tmp %config %{_sysconfdir}/xml/*.xml @@ -213,6 +170,8 @@ %files scripts %defattr(-, root, root) -%{_bindir}/* +%{_bindir}/callout-gen +%{_bindir}/dbtoepub +%{_bindir}/pdf2index %changelog ++++++ dbxslt-install.sh ++++++ #!/bin/bash # # Installs the DocBook XSL Stylesheets on openSUSE systems # # Author: Thomas Schraitle # Copyright (C) 2013 toms(a)opensuse.org # # set -x ME=${0##*/} PACKAGE=docbook-xsl-stylesheets PACKAGE_DIR=docbook-xsl PACKAGE_VERSION=@VERSION@ #---------------------------------------------------------------------- # System variables BUILDROOT= PREFIX=/usr BINDIR=bin DATAROOTDIR=share DATADIR=$DATAROOTDIR DOCDIR=$DATAROOTDIR/doc/packages SYSCONFDIR=/etc XMLCONFDIR=$SYSCONFDIR/xml XMLDIR=$DATAROOTDIR/xml DBSTYLE_CATALOG=$PACKAGE.xml DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh ORIG_DBSTYLE_DIR=$PREFIX/$DBSTYLE_DIR function exit_on_error() { local result result=${2:-1} echo "ERROR: ${1}" >&2 exit $result; } function my_debug() { # Syntax: my_debug "MESSAGE" [MORE ARGUMENTS...] # Prints debug messages, if DEBUG_SCRIPT is non-empty if [[ "$DEBUG_SCRIPT" ]]; then echo -e "[debug] ${0}: $@\n" >&2; fi } function usage() { cat << EOF Installs the DocBook XSL Stylesheets Usage: $ME [OPTIONS] Fine tuning of the installation directories: --buildroot=DIR build root directory [] --prefix=DIR [/usr] --bindir=DIR user executables [PREFIX/bin] --sysconfdir=DIR read-only single-machine data [/etc] --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] --datadir=DIR read-only architecture-independent data [DATAROOTDIR] --docdir=DIR documentation root [DATAROOTDIR/doc/packages] Package options: --package-name=NAME name of the package [$PACKAGE] --package-dir=NAME name of the package directory [$PACKAGE_DIR] --package-version=VERSION version of the package [$PACKAGE_VERSION] EOF } function printvariables() { cat << EOF package=$PACKAGE package-version=$PACKAGE_VERSION buildroot=$BUILDROOT prefix=$PREFIX bindir=$BINDIR datarootdir=$DATAROOTDIR datadir=$DATADIR sysconfdir=$SYSCONFDIR xmlconfdir=$XMLCONFDIR docdir=$DOCDIR xmldir=$XMLDIR xsltrootdir=$XSLTROOTDIR dbstyle_catalog=$DBSTYLE_CATALOG dbstyle_catalog_entry=${DBSTYLE_CATALOG_ENTRY} dbstyle_dir=$DBSTYLE_DIR EOF } #---------------------------------------------------------------------- # DEBUG_SCRIPT= DB4_XSLT_URL="http://docbook.sourceforge.net/release/xsl/" DB5_XSLT_URL="http://docbook.sourceforge.net/release/xsl-ns/" # Installation directories DBXSLT_DIRS="assembly common eclipse epub epub3 extensions fo highlighting \ html htmlhelp lib javahelp manpages profiling roundtrip slides \ webhelp website xhtml xhtml-1_1 xhtml5" DBXSLT_FILES="catalog.xml VERSION VERSION.xsl REVISION" # Without INSTALL DBXSLT_DOCFILES="params AUTHORS BUGS COPYING NEWS.html NEWS.xml README REVISION TODO \ RELEASE-NOTES.html RELEASE-NOTES.pdf RELEASE-NOTES.txt RELEASE-NOTES.xml" #---------------------------------------------------------------------- # printing help / catching errors # if [[ -z "$1" ]]; then usage printvariables exit fi longopt="help,debug,package-name:,package-version:,\ bindir:,prefix:,datarootdir:,datadir:,docdir:,sysconfdir:,buildroot:" export POSIXLY_CORRECT=1 ARGS=$(getopt -o h,d -l $longopt -n $ME -- "$@") eval set -- "$ARGS" while true ; do case "$1" in -h|--help) usage # printvariables exit ;; -d|--debug) DEBUG_SCRIPT=1 shift ;; # --package-name) PACKAGE=$2 shift 2 ;; --package-version) PACKAGE_VERSION="$2" shift 2 ;; # --buildroot) BUILDROOT=$2 shift 2 ;; --bindir) BINDIR=$2 shift 2 ;; --prefix) PREFIX=$2 shift 2 ;; --datarootdir) DATAROOTDIR=$2 shift 2 ;; --datadir) DATADIR=$2 shift 2 ;; --docdir) DOCDIR=$2 shift 2 ;; --sysconfdir) SYSCONFDIR=$2 shift 2 ;; --printvariables) printvariables exit ;; --) break ;; esac done unset POSIXLY_CORRECT PREFIX=$BUILDROOT$PREFIX BINDIR=$PREFIX/$BINDIR DATAROOTDIR=$PREFIX/$DATAROOTDIR DATADIR=$PREFIX/$DATADIR DOCDIR=$PREFIX/$DOCDIR SYSCONFDIR=$BUILDROOT$SYSCONFDIR XMLCONFDIR=$BUILDROOT/$XMLCONFDIR XMLDIR=$PREFIX/$XMLDIR XSLTROOTDIR=$PREFIX/$XSLTROOTDIR # XSLTDIR=$PREFIX/$XSLTDIR DBSTYLE_CATALOG=$PACKAGE.xml DBSTYLE_CATALOG_ENTRY=for-catalog-${PACKAGE}-${PACKAGE_VERSION}.xml DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh printvariables #---------------------------------------------------------------------- # # function create_directory_structure() { local i my_debug "\n\n=== Create directory structure ===" for i in $PREFIX $BINDIR $DATAROOTDIR $DATADIR $XMLCONFDIR $DOCDIR/$PACKAGE/html $DBSTYLE_DIR/$PACKAGE_VERSION; do mkdir ${DEBUG_SCRIPT:+-v} -p $i [[ $? -ne 0 ]] && exit_on_error "Could not create $i directory" done } #---------------------------------------------------------------------- # # function install_dbxsltdirs() { my_debug "\n\n=== Install all DocBook XSL stylesheet directories ===" cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_DIRS $DBSTYLE_DIR/$PACKAGE_VERSION } function create_link() { my_debug "\n\n=== Create link ===" pushd $DBSTYLE_DIR 2>/dev/null ln -s $PACKAGE_VERSION current popd } function install_scripts() { my_debug "\n\n=== Install scripts ===" install ${DEBUG_SCRIPT:+-v} -m755 fo/pdf2index $BINDIR install ${DEBUG_SCRIPT:+-v} -m755 epub/bin/dbtoepub $BINDIR install ${DEBUG_SCRIPT:+-v} -m755 slides/images/callouts/gen.sh $BINDIR/callout-gen # rm fo/pdf2index epub/bin/dbtoepub slides/images/callouts/gen.sh } function install_dbxsltfiles() { my_debug "\n\n=== Install other files ===" cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_FILES $DBSTYLE_DIR/$PACKAGE_VERSION } function install_dbxsltdocfiles() { my_debug "\n\n=== Install documentation ===" my_debug " Current dir: $PWD" for i in "$DBXSLT_DOCFILES"; do cp ${DEBUG_SCRIPT:+-v} -a $i $DOCDIR/$PACKAGE done } function create_dbxslt_catalog() { my_debug "\n\n=== Create catalog file ===" # /etc/xml/docbook-xsl-stylesheets.xml xmlcatalog --noout --create $XMLCONFDIR/$DBSTYLE_CATALOG } function create_dbxslt_addentries() { my_debug "\n\n=== Create entries in the catalog file ===" xmlcatalog --noout --add "rewriteSystem" \ "${DB4_XSLT_URL}${PACKAGE_VERSION}" \ "file://$ORIG_DBSTYLE_DIR/${PACKAGE_VERSION}" $XMLCONFDIR/$DBSTYLE_CATALOG xmlcatalog --noout --add "rewriteURI" \ "${DB4_XSLT_URL}${PACKAGE_VERSION}" \ "file://$ORIG_DBSTYLE_DIR/$PACKAGE_VERSION" $XMLCONFDIR/$DBSTYLE_CATALOG xmlcatalog --noout --add "rewriteSystem" \ "${DB4_XSLT_URL}current" \ "file://$ORIG_DBSTYLE_DIR/current" $XMLCONFDIR/$DBSTYLE_CATALOG xmlcatalog --noout --add "rewriteURI" \ "${DB4_XSLT_URL}current" \ "file://$ORIG_DBSTYLE_DIR/current" $XMLCONFDIR/$DBSTYLE_CATALOG # # temporary file that is added to /etc/xml/suse-catalog.xml # during post # xmlcatalog --noout --create $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} xmlcatalog --noout --add "delegateSystem" \ "${DB4_XSLT_URL}" \ "file:///etc/xml/${DBSTYLE_CATALOG}" $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} sed -i -e "/<catalog/a\ <group id=\"${PACKAGE}\">" \ -e '/<\/catalog/i\ </group>' $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} } function cleanup_buildroot() { rm $DBSTYLE_DIR/$PACKAGE_VERSION/fo/pdf2index \ $DBSTYLE_DIR/$PACKAGE_VERSION/epub/bin/dbtoepub \ $DBSTYLE_DIR/$PACKAGE_VERSION/slides/images/callouts/gen.sh } #---------------------------------------------------------------------- # MAIN # # [[ -e "$PACKAGE_DIR-$PACKAGE_VERSION" ]] || exit_on_error "Could not find directory $PACKAGE_DIR-$PACKAGE_VERSION" # # cd $PACKAGE_DIR-$PACKAGE_VERSION create_directory_structure # create_link install_dbxsltdirs install_dbxsltfiles install_scripts install_dbxsltdocfiles # create_dbxslt_catalog create_dbxslt_addentries cleanup_buildroot # EOF-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-translations for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package desktop-translations for openSUSE:Factory checked in at 2013-10-01 08:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/desktop-translations (Old) and /work/SRC/openSUSE:Factory/.desktop-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "desktop-translations" Changes: -------- --- /work/SRC/openSUSE:Factory/desktop-translations/desktop-translations.changes 2013-09-27 17:08:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-translations.new/desktop-translations.changes 2013-10-01 08:09:55.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 30 10:47:22 UTC 2013 - ke(a)suse.de + +- Update translations. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-translations.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/desktop-translations/desktop-translations.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-translations.new/desktop-translations.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-translations for openSUSE:13.1
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package desktop-translations for openSUSE:13.1 checked in at 2013-10-01 08:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/desktop-translations (Old) and /work/SRC/openSUSE:13.1/.desktop-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "desktop-translations" Changes: -------- --- /work/SRC/openSUSE:13.1/desktop-translations/desktop-translations.changes 2013-09-27 17:08:46.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.desktop-translations.new/desktop-translations.changes 2013-10-01 08:09:57.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 30 10:47:22 UTC 2013 - ke(a)suse.de + +- Update translations. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-translations.tar.bz2 ++++++ /work/SRC/openSUSE:13.1/desktop-translations/desktop-translations.tar.bz2 /work/SRC/openSUSE:13.1/.desktop-translations.new/desktop-translations.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cantarell-fonts for openSUSE:13.1
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package cantarell-fonts for openSUSE:13.1 checked in at 2013-10-01 08:09:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/cantarell-fonts (Old) and /work/SRC/openSUSE:13.1/.cantarell-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantarell-fonts" Changes: -------- --- /work/SRC/openSUSE:13.1/cantarell-fonts/cantarell-fonts.changes 2013-09-23 10:48:19.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.cantarell-fonts.new/cantarell-fonts.changes 2013-10-01 08:09:16.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 27 19:17:44 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 0.0.15: + + Improved spacing for cyrillics (bgo#703588). + + Fixed hinting on numerals (bgo#704084). + + Bold outlines improved (bgo#706358). + + Improved cyrillics (bgo#706358). + + Improved outlines and spacing (bgo#703115). + + Missing romanian accent glyphs (bgo#705004). + + Uppercase U shape improvements (bgo#702955). + +------------------------------------------------------------------- Old: ---- cantarell-fonts-0.0.14.tar.xz New: ---- cantarell-fonts-0.0.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantarell-fonts.spec ++++++ --- /var/tmp/diff_new_pack.TCI5zr/_old 2013-10-01 08:09:16.000000000 +0200 +++ /var/tmp/diff_new_pack.TCI5zr/_new 2013-10-01 08:09:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: cantarell-fonts -Version: 0.0.14 +Version: 0.0.15 Release: 0 Summary: Contemporary Humanist Sans Serif Font License: OFL-1.1 ++++++ cantarell-fonts-0.0.14.tar.xz -> cantarell-fonts-0.0.15.tar.xz ++++++ ++++ 6905 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cantarell-fonts for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '13

01 Oct '13

Hello community, here is the log from the commit of package cantarell-fonts for openSUSE:Factory checked in at 2013-10-01 08:09:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantarell-fonts (Old) and /work/SRC/openSUSE:Factory/.cantarell-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantarell-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/cantarell-fonts/cantarell-fonts.changes 2013-09-23 08:51:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cantarell-fonts.new/cantarell-fonts.changes 2013-10-01 08:09:15.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 27 19:17:44 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 0.0.15: + + Improved spacing for cyrillics (bgo#703588). + + Fixed hinting on numerals (bgo#704084). + + Bold outlines improved (bgo#706358). + + Improved cyrillics (bgo#706358). + + Improved outlines and spacing (bgo#703115). + + Missing romanian accent glyphs (bgo#705004). + + Uppercase U shape improvements (bgo#702955). + +------------------------------------------------------------------- Old: ---- cantarell-fonts-0.0.14.tar.xz New: ---- cantarell-fonts-0.0.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantarell-fonts.spec ++++++ --- /var/tmp/diff_new_pack.15rLnA/_old 2013-10-01 08:09:16.000000000 +0200 +++ /var/tmp/diff_new_pack.15rLnA/_new 2013-10-01 08:09:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: cantarell-fonts -Version: 0.0.14 +Version: 0.0.15 Release: 0 Summary: Contemporary Humanist Sans Serif Font License: OFL-1.1 ++++++ cantarell-fonts-0.0.14.tar.xz -> cantarell-fonts-0.0.15.tar.xz ++++++ ++++ 6905 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0