packages (TELLICO_1_3): tellico/gcc44.patch, tellico/tellico.spec - up to 1...

[glen]

Author: glen                         Date: Mon Jan 10 19:52:18 2011 GMT
Module: packages                      Tag: TELLICO_1_3
---- Log message:
- up to 1.3.6

---- Files affected:
packages/tellico:
   gcc44.patch (1.1 -> 1.1.2.1) , tellico.spec (1.60 -> 1.60.2.1) 

---- Diffs:

================================================================
Index: packages/tellico/gcc44.patch
diff -u packages/tellico/gcc44.patch:1.1 packages/tellico/gcc44.patch:1.1.2.1
--- packages/tellico/gcc44.patch:1.1	Tue Nov  3 15:19:33 2009
+++ packages/tellico/gcc44.patch	Mon Jan 10 20:52:13 2011
@@ -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;
+ }

================================================================
Index: packages/tellico/tellico.spec
diff -u packages/tellico/tellico.spec:1.60 packages/tellico/tellico.spec:1.60.2.1
--- packages/tellico/tellico.spec:1.60	Tue Nov  3 15:19:33 2009
+++ packages/tellico/tellico.spec	Mon Jan 10 20:52:13 2011
@@ -2,20 +2,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
@@ -51,6 +52,7 @@
 cp -f /usr/share/automake/config.sub admin
 %configure \
 	%{?with_webcam:--enable-webcam} \
+	--with%{!?with_arts:out}-arts \
 	--with-qt-libraries=%{_libdir}
 
 %{__make}
@@ -100,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60.2.1  2011/01/10 19:52:13  glen
+- up to 1.3.6
+
 Revision 1.60  2009/11/03 14:19:33  glen
 - add gcc44.patch; rel 2 (thx patrys)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tellico/gcc44.patch?r1=1.1&r2=1.1.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tellico/tellico.spec?r1=1.60&r2=1.60.2.1&f=u