Accepting request 100624 from KDE:Distro:Factory
Update to tellico 2.3.5, Removed boolean_fields_fix.patch, Spec file updates (forwarded request 100622 from adra) OBS-URL: https://build.opensuse.org/request/show/100624 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=51
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
aaf827088d
commit
0e1009c819
@ -1,34 +0,0 @@
|
||||
--- a/src/models/entrymodel.cpp
|
||||
+++ b/src/models/entrymodel.cpp
|
||||
@@ -104,22 +104,23 @@ QVariant EntryModel::data(const QModelIn
|
||||
if(!field) {
|
||||
return QVariant();
|
||||
}
|
||||
- if(field->type() == Data::Field::Bool) {
|
||||
- return m_checkPix;
|
||||
- } else if(field->type() == Data::Field::Rating) {
|
||||
- return GUI::RatingWidget::pixmap(value);
|
||||
- }
|
||||
-
|
||||
entry = this->entry(index_);
|
||||
if(!entry) {
|
||||
return QVariant();
|
||||
}
|
||||
-
|
||||
- // we don't need a formatted value for image id
|
||||
+ // we don't need a formatted value for any pixmaps
|
||||
value = entry->field(field);
|
||||
if(value.isEmpty()) {
|
||||
return QVariant();
|
||||
}
|
||||
+
|
||||
+ if(field->type() == Data::Field::Bool) {
|
||||
+ // assume any non-empty value equals true
|
||||
+ return m_checkPix;
|
||||
+ } else if(field->type() == Data::Field::Rating) {
|
||||
+ return GUI::RatingWidget::pixmap(value);
|
||||
+ }
|
||||
+
|
||||
if(m_imagesAreAvailable && field->type() == Data::Field::Image) {
|
||||
const Data::Image& img = ImageFactory::imageById(value);
|
||||
if(!img.isNull()) {
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:376d8e8db8fcf19f77300e10921991d67d3d99e1abb88eda97900932c6e486fd
|
||||
size 2910721
|
||||
3
tellico-2.3.5.tar.bz2
Normal file
3
tellico-2.3.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c
|
||||
size 4402734
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 20:05:31 UTC 2012 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to tellico 2.3.5:
|
||||
Features:
|
||||
* Added Amazon.com data sources for China, Spain, and Italy.
|
||||
* Added filter rules for dates before and after.
|
||||
* Updated GCstar exporter to include images.
|
||||
* Updated Discogs fetcher to use API v2.
|
||||
* Updated Wine.com fetcher to use API v2.
|
||||
* Updated fetcher for Allocine.fr.
|
||||
Bug Fixes:
|
||||
* Fixed bug that always showed checkmark for boolean field values
|
||||
(kde#283444).
|
||||
* Fixed importing of multi-line notes from Alexandria (kde#289022).
|
||||
* Fixed bug with merging entries (kde#289346).
|
||||
* Fixed bug with Cancel not working in the Entry Merge dialog.
|
||||
* Fixed broken script for searching Dark Horse Comics.
|
||||
* Fixed a crashing bug when using the scanner dialog.
|
||||
* Improved support for importing movies and music from Delicious Library.
|
||||
- Removed "boolean_fields_fix.patch" (included in the new version).
|
||||
- Spec file updates:
|
||||
* Changes based on spec-cleaner run.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 16 11:06:34 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
|
||||
24
tellico.spec
24
tellico.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package tellico
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 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
|
||||
@ -15,21 +15,14 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: tellico
|
||||
Version: 2.3.4
|
||||
Release: 1
|
||||
Version: 2.3.5
|
||||
Release: 0
|
||||
Summary: A Collection Manager for KDE
|
||||
|
||||
License: GPL-2.0+
|
||||
Url: http://tellico-project.org/
|
||||
Group: Productivity/Office/Other
|
||||
Url: http://tellico-project.org/
|
||||
Source0: http://tellico-project.org/files/%{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM boolean_fields_fix.patch bko#283444 asterios.dramis@gmail.com -- Fix for "Boolean fields are always shown with checkmark in list view, no matter the value" (taken from upstream)
|
||||
Patch0: boolean_fields_fix.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libexempi-devel
|
||||
BuildRequires: libkcddb4-devel
|
||||
@ -41,17 +34,18 @@ BuildRequires: libpoppler-qt4-devel
|
||||
BuildRequires: libqimageblitz-devel
|
||||
BuildRequires: libqjson-devel
|
||||
BuildRequires: libv4l-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libyaz-devel
|
||||
BuildRequires: taglib-devel
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
Requires: kdepim4-runtime
|
||||
Recommends: %{name}-lang = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun): shared-mime-info
|
||||
Recommends: %{name}-lang = %{version}
|
||||
%kde4_pimlibs_requires
|
||||
%kde4_runtime_requires
|
||||
|
||||
@ -63,7 +57,6 @@ stamps, trading cards, comic books, and wines.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake_kde4 "-DENABLE_WEBCAM=true" -d build
|
||||
@ -93,9 +86,6 @@ rm -r %{buildroot}/nogo/
|
||||
%postun
|
||||
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING ChangeLog README tellico.lsm
|
||||
|
||||
Loading…
Reference in New Issue
Block a user