rpms/tellico/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 tellico.spec, 1.36, 1.37

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12020

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
- Update to upstream version 2.0 pre-release 2
- Drop gcc4 patch, now upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	5 Mar 2009 11:08:38 -0000	1.17
+++ .cvsignore	12 Sep 2009 03:26:00 -0000	1.18
@@ -1 +1 @@
-tellico-1.3.5.tar.gz
+tellico-2.0pre2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	5 Mar 2009 11:08:38 -0000	1.17
+++ sources	12 Sep 2009 03:26:00 -0000	1.18
@@ -1 +1 @@
-ca5d9db11fa1dd33dfe317ffe095435c  tellico-1.3.5.tar.gz
+d4905872c16fa7e120b936ac0c1c7c3e  tellico-2.0pre2.tar.bz2


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- tellico.spec	27 Jul 2009 05:45:48 -0000	1.36
+++ tellico.spec	12 Sep 2009 03:26:00 -0000	1.37
@@ -1,15 +1,15 @@
 Name:           tellico
-Version:        1.3.5
-Release:        2%{?dist}
+Version:        2.0
+Release:        0.1.pre2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.periapsis.org/tellico/
-Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.3.5-gcc44.patch
+Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake >= 2.6.2-3
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -22,7 +22,12 @@ BuildRequires:  taglib-devel
 BuildRequires:  libyaz-devel
 BuildRequires:  exempi-devel
 BuildRequires:  poppler-qt-devel
-BuildRequires:  kdelibs3-devel
+BuildRequires:  kdelibs4-devel
+BuildRequires:  qimageblitz-devel
+BuildRequires:  poppler-qt4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  kdemultimedia-devel
+BuildRequires:  kdegraphics-devel
 
 %if 0%{?fedora} < 10
 BuildRequires:  kdepim3-devel
@@ -52,17 +57,21 @@ directly from Amazon.com.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}pre2
 
 %build
-%configure --disable-rpath --enable-webcam
-make %{?_smp_mflags}
 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
+popd
+
+#configure --disable-rpath --enable-webcam
+make %{?_smp_mflags}  -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
 %find_lang %{name}
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
@@ -74,9 +83,9 @@ done
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
   --add-category X-Fedora                           \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*
 
 
 %post
@@ -100,19 +109,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/*
-%{_datadir}/applications/kde/tellico.desktop
-%{_datadir}/apps/kconf_update/
+%{_datadir}/applications/kde4/tellico.desktop
+%{_datadir}/kde4/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
 %{_datadir}/config/tellicorc
-%{_datadir}/apps/tellico/
+%{_datadir}/config/tellico-script.knsrc
+%{_datadir}/config/tellico-template.knsrc
+%{_datadir}/kde4/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 %{_datadir}/mime/packages/tellico.xml
 
 
 %changelog
+* Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
+- Update to upstream version 2.0 pre-release 2
+- Drop gcc4 patch, now upstream
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild