OBS User unknown 2009-02-23 23:17:54 +00:00 committed by Git OBS Bridge
parent 6a9a721960
commit 7898670764
5 changed files with 43 additions and 80 deletions

View File

@ -1,58 +1,8 @@
--- Makefile.am --- CMakeLists.txt
+++ Makefile.am +++ CMakeLists.txt
@@ -36,6 +36,7 @@ @@ -1,4 +1,5 @@
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4 PROJECT(tellico)
+cmake_minimum_required(VERSION 2.6)
xdg_apps_DATA = tellico.desktop #http://www.cmake.org/Wiki/CMake_Useful_Variables
+xdg_mimedir = $(kde_datadir)/mime/packages # automatically add CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR
xdg_mime_DATA = tellico.xml
mimedir = $(kde_mimedir)/application
--- src/cite/lyxpipe.cpp
+++ src/cite/lyxpipe.cpp
@@ -21,6 +21,7 @@
#include <klocale.h>
#include <qfile.h>
+#include <klocale.h>
#include <sys/types.h>
#include <sys/stat.h>
--- src/entryview.cpp
+++ src/entryview.cpp
@@ -27,6 +27,7 @@
#include "latin1literal.h"
#include "../core/drophandler.h"
+#include <klocale.h>
#include <kstandarddirs.h>
#include <krun.h>
#include <kmessagebox.h>
--- src/translators/audiofileimporter.cpp
+++ src/translators/audiofileimporter.cpp
@@ -244,10 +244,10 @@
entry->setField(file, insertValue(entry->field(file), fileValue, trackNum));
}
} else {
- myDebug() << *it << " contains no track number and track number cannot be determined, so the track is not imported." << endl;
+ kdDebug() << *it << " contains no track number and track number cannot be determined, so the track is not imported." << endl;
}
} else {
- myDebug() << *it << " has an empty title, so the track is not imported." << endl;
+ kdDebug() << *it << " has an empty title, so the track is not imported." << endl;
}
if(!tag->comment().stripWhiteSpace().isEmpty()) {
QString c = entry->field(comments);
@@ -366,9 +366,9 @@
list += QString::null;
}
if(!list[pos_-1].isNull()) {
- myDebug() << "AudioFileImporter::insertValue() - overwriting track " << pos_ << endl;
- myDebug() << "*** Old value: " << list[pos_-1] << endl;
- myDebug() << "*** New value: " << value_ << endl;
+ kdDebug() << "AudioFileImporter::insertValue() - overwriting track " << pos_ << endl;
+ kdDebug() << "*** Old value: " << list[pos_-1] << endl;
+ kdDebug() << "*** New value: " << value_ << endl;
}
list[pos_-1] = value_;
return list.join(QString::fromLatin1("; "));

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddc5d3fa89711d00984249f8e4b53b9cd619f269ae4f73ebc55113bb2910e6b5
size 4065763

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40752b4ba653bd6cdcd821d1ff1f2dcd3c1e1b2fbffecfa71b7bfa5f0d024442
size 6560336

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 23 12:17:04 CET 2009 - pgajdos@suse.cz
- updated to SVN version ported to KDE4 (upcomming 2.0.0)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 16 11:46:00 CET 2009 - pgajdos@suse.cz Mon Feb 16 11:46:00 CET 2009 - pgajdos@suse.cz

View File

@ -1,5 +1,5 @@
# #
# spec file for package tellico (Version 1.3.5) # spec file for package tellico (Version 1.9_SVN20090219)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,9 +19,9 @@
Name: tellico Name: tellico
BuildRequires: kdemultimedia3-CD kdemultimedia3-devel libyaz-devel taglib-devel tcpd-devel BuildRequires: cmake kdemultimedia4 kdepim4-devel libkde4-devel libpoppler-qt4-devel libqimageblitz-devel
Summary: A book collection manager Summary: A book collection manager
Version: 1.3.5 Version: 1.9_SVN20090219
Release: 1 Release: 1
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Other Group: Productivity/Other
@ -29,10 +29,11 @@ Source: %{name}-%{version}.tar.bz2
Provides: bookcase Provides: bookcase
Obsoletes: bookcase Obsoletes: bookcase
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /opt/kde3
Url: http://www.periapsis.org/tellico/ Url: http://www.periapsis.org/tellico/
Patch: fix-compile.diff Patch: fix-compile.diff
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
%kde4_pimlibs_requires
%kde4_runtime_requires
%description %description
Tellico is an KDE application for keeping track of your collections. It Tellico is an KDE application for keeping track of your collections. It
@ -45,20 +46,21 @@ coins, stamps, trading cards, comic books, and wines.
%prep %prep
%setup -q %setup -q
%patch %patch
. /etc/opt/kde3/common_options
update_admin --no-unsermake
%build %build
. /etc/opt/kde3/common_options %cmake_kde4 -d build
./configure $configkde --disable-final %make_jobs
do_make %{?jobs:-j %jobs}
%install %install
. /etc/opt/kde3/common_options cd build
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %makeinstall
cd ..
rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/fr/tellico/fr/common
rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/en/tellico/en/common
rm -r $RPM_BUILD_ROOT/nogo
%suse_update_desktop_file %name Office Database %suse_update_desktop_file %name Office Database
%find_lang %{name} %find_lang %{name}
kde_post_install %kde_post_install
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -66,17 +68,23 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc AUTHORS COPYING ChangeLog %doc AUTHORS COPYING ChangeLog
/opt/kde3/bin/tellico %{_bindir}/tellico
/opt/kde3/share/applications/* %{_datadir}/applications/kde4/tellico.desktop
/opt/kde3/share/apps/* %{_datadir}/icons/hicolor/*/apps/tellico.png
/opt/kde3/share/config/* %{_datadir}/icons/hicolor/*/mimetypes/application-x-tellico.png
/opt/kde3/share/config.kcfg/* %{_datadir}/mime/packages/tellico.xml
/opt/kde3/share/icons/* %{_kde_share_dir}/apps/kconf_update/tellico*
/opt/kde3/share/mimelnk/* %{_kde_share_dir}/config.kcfg/tellico_config.kcfg
%{_kde_share_dir}/apps/%{name}
%{_kde_config_dir}/*
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root,0755)
%dir %{_kde_html_dir}/fr
%changelog %changelog
* Mon Feb 23 2009 pgajdos@suse.cz
- updated to SVN version ported to KDE4 (upcomming 2.0.0)
* Mon Feb 16 2009 pgajdos@suse.cz * Mon Feb 16 2009 pgajdos@suse.cz
- update to 1.3.5: - update to 1.3.5:
* Updated entry updating to not combine multiple values. * Updated entry updating to not combine multiple values.