From b3460c96704d198cb392e52eb9e9f2e6b0aa4938647ed9931fdce80c5cdae317 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 14 Jan 2011 02:30:21 +0000 Subject: [PATCH] Accepting request 58040 from KDE:Distro:Factory Accepted submit request 58040 from user rwooninck OBS-URL: https://build.opensuse.org/request/show/58040 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=37 --- save.diff | 16 --------- tellico-2.3.1.tar.bz2 | 3 -- tellico-2.3.2.tar.bz2 | 3 ++ tellico.changes | 23 +++++++++++++ tellico.spec | 76 ++++++++++++++++++++++++------------------- 5 files changed, 68 insertions(+), 53 deletions(-) delete mode 100644 save.diff delete mode 100644 tellico-2.3.1.tar.bz2 create mode 100644 tellico-2.3.2.tar.bz2 diff --git a/save.diff b/save.diff deleted file mode 100644 index 42d75ef..0000000 --- a/save.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- trunk/extragear/office/tellico/src/detailedlistview.cpp 2010/11/11 05:02:55 1195445 -+++ trunk/extragear/office/tellico/src/detailedlistview.cpp 2010/11/11 05:03:32 1195446 -@@ -133,8 +133,13 @@ - } - } - -+ // we don't want to immediately hide all these columns when adding fields -+ disconnect(model(), SIGNAL(columnsInserted(const QModelIndex&, int, int)), -+ this, SLOT(hideNewColumn(const QModelIndex&, int, int))); - sourceModel()->setImagesAreAvailable(false); - sourceModel()->setFields(coll_->fields()); -+ connect(model(), SIGNAL(columnsInserted(const QModelIndex&, int, int)), -+ this, SLOT(hideNewColumn(const QModelIndex&, int, int))); - - // we're not using saveState() and restoreState() since our columns are variable - QStringList columnNames = config.readEntry(QLatin1String("ColumnNames") + configN, QStringList()); diff --git a/tellico-2.3.1.tar.bz2 b/tellico-2.3.1.tar.bz2 deleted file mode 100644 index 581f105..0000000 --- a/tellico-2.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29f2c8f20cd9658d86d87d2bfc768a85f302e41cda1206301ada7340ae7984b2 -size 2806870 diff --git a/tellico-2.3.2.tar.bz2 b/tellico-2.3.2.tar.bz2 new file mode 100644 index 0000000..0631a16 --- /dev/null +++ b/tellico-2.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeade154506617a9c70406b07ec7e3d638eccebbec27176b80bc3d81267d8804 +size 2821066 diff --git a/tellico.changes b/tellico.changes index 79541ba..52a0783 100644 --- a/tellico.changes +++ b/tellico.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Jan 10 20:29:26 UTC 2011 - asterios.dramis@gmail.com + +- Update to version 2.3.2 + * Fixed bug with list view settings not being saved between sessions (Bug + 256373) + * Fixed bug with updating groups for derived values (Bug 256374) + * Made Nepomuk support optional + * Added cover art support for MusicBrainz source + * Fixed Google Scholar data source to properly fetch Bibtex + * Fixed bug with FreeDB results not using track artists (Bug 258541) + * Fixed bug with importing Bibtex file with keyword and keywords fields (Bug + 258269) + * Fixed sorting multiple numeric values in column view + * Fixed sorting for numeric values in group view + * Updated Allocine script to version 0.7.3 (Bug 258281) + * Updated Bibtex importer to translate non-breaking spaces +- Spec file updates + * Changes based on rpmdevtools templates and spec-cleaner run. + * Updates in BuildRequires: and %install sections. + * Use Suggests: instead of Requires: for the tellico-lang package. +- Removed the patch for Bug 256373 (fixed upstream). + ------------------------------------------------------------------- Fri Dec 10 21:40:43 UTC 2010 - alinm.elena@gmail.com diff --git a/tellico.spec b/tellico.spec index 4be4ea2..9286520 100644 --- a/tellico.spec +++ b/tellico.spec @@ -1,7 +1,7 @@ # -# spec file for package tellico (Version 2.3.1) +# spec file for package tellico (Version 2.3.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,42 +14,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # norootforbuild Name: tellico -BuildRequires: cmake fdupes libkde4-devel libkdepimlibs4-devel libpoppler-qt4-devel libqimageblitz-devel -BuildRequires: libexempi-devel libkcddb4-devel libksane-devel libqjson-devel libyaz-devel taglib-devel +Version: 2.3.2 +Release: 1 Summary: A book collection manager -Version: 2.3.1 -Release: 2 + License: GPLv2+ -Group: Productivity/Other -Source: %{name}-%{version}.tar.bz2 -Patch: save.diff -Provides: bookcase -Obsoletes: bookcase -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://tellico-project.org -# PATCH-FIX-UPSTREAM fix-compile.diff pgajdos@suse.cz -Requires: %{name}-lang = %{version} +Group: Productivity/Other +Source0: http://tellico-project.org/files/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: fdupes +BuildRequires: libexempi-devel +BuildRequires: libkcddb4-devel +BuildRequires: libkcompactdisc4-devel +BuildRequires: libkde4-devel +BuildRequires: libkdepimlibs4-devel +BuildRequires: libksane-devel +BuildRequires: libpoppler-qt4-devel +BuildRequires: libqimageblitz-devel +BuildRequires: libqjson-devel +BuildRequires: libyaz-devel +BuildRequires: taglib-devel +BuildRequires: update-desktop-files +Requires: kdepim4-runtime %kde4_pimlibs_requires %kde4_runtime_requires -Requires: kdepim4-runtime +Suggests: %{name}-lang = %{version} +Provides: bookcase +Obsoletes: bookcase %description Tellico is an KDE application for keeping track of your collections. It provides default templates for books, bibliographies, videos, music, coins, stamps, trading cards, comic books, and wines. - - - %lang_package + %prep -%setup -q -%patch -p 4 +%setup -q %build %cmake_kde4 -d build @@ -57,27 +64,27 @@ coins, stamps, trading cards, comic books, and wines. %install cd build -%makeinstall +%kde4_makeinstall cd .. -rm -r $RPM_BUILD_ROOT/nogo -%suse_update_desktop_file %name Office Database +rm -r %{buildroot}/nogo +%suse_update_desktop_file %{name} Office Database %find_lang %{name} %kde_post_install -%if %suse_version < 1120 -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/sv/common -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/en/common -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/fr/common -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt_BR/common +%if 0%{?suse_version} < 1120 +mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/sv/common +mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/en/common +mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/fr/common +mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/uk/common +mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/pt_BR/common %endif -fdupes -r $RPM_BUILD_ROOT +fdupes -r %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -%defattr(-,root,root,0755) -%doc AUTHORS COPYING ChangeLog +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog README %{_bindir}/tellico %{_datadir}/applications/kde4/tellico.desktop %{_datadir}/icons/hicolor/*/apps/tellico.png @@ -89,5 +96,6 @@ rm -rf $RPM_BUILD_ROOT %{_kde_config_dir}/* %files lang -f %{name}.lang +%defattr(-,root,root,-) %changelog