packages: tellico/tellico.spec - 2.2 - cmake - small fixes

[uzsolt]

Author: uzsolt                       Date: Sun May 30 11:12:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.2
- cmake
- small fixes

---- Files affected:
packages/tellico:
   tellico.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: packages/tellico/tellico.spec
diff -u packages/tellico/tellico.spec:1.60 packages/tellico/tellico.spec:1.61
--- packages/tellico/tellico.spec:1.60	Tue Nov  3 15:19:33 2009
+++ packages/tellico/tellico.spec	Sun May 30 13:12:09 2010
@@ -6,21 +6,18 @@
 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
-License:	GPL v2
+Version:	2.2
+Release:	0.1
+License:	GPL v3
 Group:		X11/Applications
-Source0:	http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-# Source0-md5:	ca5d9db11fa1dd33dfe317ffe095435c
-Patch0:		%{name}-u64.patch
+Source0:	http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	204cc66527f0ba8f8bda48b1f21a3dcd
 Patch1:		%{name}-desktop.patch
-Patch2:		gcc44.patch
 URL:		http://www.periapsis.org/tellico/
-BuildRequires:	automake
 BuildRequires:	exempi-devel
-BuildRequires:	kdelibs-devel >= 9:3.3.1
-BuildRequires:	kdemultimedia-devel
-BuildRequires:	kdepim-devel
+BuildRequires:	cmake
+BuildRequires:	kde4-kdemultimedia-devel
+BuildRequires:	kde4-kdepim-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.19
@@ -43,16 +40,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-cp -f /usr/share/automake/config.sub admin
-%configure \
-	%{?with_webcam:--enable-webcam} \
-	--with-qt-libraries=%{_libdir}
-
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 %{__make}
 
 %install
@@ -64,7 +55,7 @@
 	kde_htmldir=%{_kdedocdir} \
 	kde_libs_htmldir=%{_kdedocdir}
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{ee,et}
+rm -rf $RPM_BUILD_ROOT/nogo
 
 %find_lang %{name} --with-kde
 
@@ -81,17 +72,18 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/mimelnk/application/x-%{name}.desktop
 %{_datadir}/apps/kconf_update/%{name}-rename.upd
 %{_datadir}/apps/kconf_update/tellico.upd
 %{_datadir}/apps/kconf_update/tellico-1-3-update.pl
 %{_datadir}/apps/%{name}
 %{_datadir}/config/tellicorc
+%{_datadir}/config/tellico-script.knsrc
+%{_datadir}/config/tellico-template.knsrc
 %{_datadir}/config.kcfg/tellico_config.kcfg
 %{_datadir}/mime/packages/*.xml
-%{_desktopdir}/kde/%{name}.desktop
+%{_desktopdir}/kde4/%{name}.desktop
 %{_iconsdir}/*/*/*/*.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -100,6 +92,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2010/05/30 11:12:09  uzsolt
+- 2.2
+- cmake
+- small fixes
+
 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/tellico.spec?r1=1.60&r2=1.61&f=u