- up to 1.3.6

Changed files:
    gcc44.patch -> 1.1.2.1
    tellico.spec -> 1.60.2.1

diff --git a/gcc44.patch b/gcc44.patch
index 236046640479976bb472854ee43feb54c725a2d1..e1a0bcc7338ea9ea27c77b41285a3919370f5ef4 100644 (file)
--- a/gcc44.patch
+++ b/gcc44.patch
@@ -9,3 +9,14 @@
              (memchr(chunk.data() + 4, 0, 32));
          if (null_ptr)
              lv.name = std::string((char *) (chunk.data() + 4),
+--- tellico-1.3.6/src/cite/actionmanager.cpp~  2008-01-07 07:33:53.000000000 +0200
++++ tellico-1.3.6/src/cite/actionmanager.cpp   2011-01-10 21:46:34.197702109 +0200
+@@ -20,7 +20,7 @@
+ 
+ using Tellico::Cite::ActionManager;
+ 
+-ActionManager::ActionManager* ActionManager::self() {
++ActionManager* ActionManager::self() {
+   static ActionManager self;
+   return &self;
+ }

diff --git a/tellico.spec b/tellico.spec
index aad523f051c430cc86b674cd4591b76b56ef1322..66b090578d2f205d7b86cf0f1c878b22313d97d6 100644 (file)
--- a/tellico.spec
+++ b/tellico.spec
@@ -1,20 +1,21 @@
 #
 # Conditional build:
 %bcond_with    webcam  # build with webcam barcode recognition
-#
+%bcond_with    arts                    # build with aRts support
+
 Summary:       A collection manager
 Summary(pl.UTF-8):     Zarządca zbiorów wideo, audio i książek
 Name:          tellico
-Version:       1.3.5
-Release:       2
+Version:       1.3.6
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-# Source0-md5: ca5d9db11fa1dd33dfe317ffe095435c
+Source0:       http://tellico-project.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: 7e1af02c1375e4d20e199f6fb06391d0
 Patch0:                %{name}-u64.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                gcc44.patch
-URL:           http://www.periapsis.org/tellico/
+URL:           http://www.tellico-project.org/
 BuildRequires: automake
 BuildRequires: exempi-devel
 BuildRequires: kdelibs-devel >= 9:3.3.1
@@ -50,6 +51,7 @@ księgozbiorów, archiwów wideo i audio.
 cp -f /usr/share/automake/config.sub admin
 %configure \
        %{?with_webcam:--enable-webcam} \
+       --with%{!?with_arts:out}-arts \
        --with-qt-libraries=%{_libdir}
 
 %{__make}