rpms/tellico/F-11 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 tellico.spec, 1.35, 1.36 tellico-1.3.5-gcc44.patch, 1.1, NONE

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/tellico/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv748

Modified Files:
	.cvsignore sources tellico.spec 
Removed Files:
	tellico-1.3.5-gcc44.patch 
Log Message:
Update to 2.0: sync with F-12 branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/.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	20 Oct 2009 21:57:59 -0000	1.18
@@ -1 +1 @@
-tellico-1.3.5.tar.gz
+tellico-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/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	20 Oct 2009 21:57:59 -0000	1.18
@@ -1 +1 @@
-ca5d9db11fa1dd33dfe317ffe095435c  tellico-1.3.5.tar.gz
+e7dce8a5f3086b9fbf8cd33d83a28f88  tellico-2.0.tar.bz2


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/tellico.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- tellico.spec	5 Mar 2009 11:08:38 -0000	1.35
+++ tellico.spec	20 Oct 2009 21:58:00 -0000	1.36
@@ -1,15 +1,15 @@
 Name:           tellico
-Version:        1.3.5
+Version:        2.0
 Release:        1%{?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
+URL:            http://tellico-project.org/
+Source0:        http://tellico-project.org/files/tellico-%{version}.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,15 +22,12 @@ BuildRequires:  taglib-devel
 BuildRequires:  libyaz-devel
 BuildRequires:  exempi-devel
 BuildRequires:  poppler-qt-devel
-BuildRequires:  kdelibs3-devel
-
-%if 0%{?fedora} < 10
-BuildRequires:  kdepim3-devel
-%endif
-
-%if 0%{?fedora} < 9
-BuildRequires:  kdemultimedia3-devel
-%endif
+BuildRequires:  kdelibs4-devel
+BuildRequires:  qimageblitz-devel
+BuildRequires:  poppler-qt4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  kdemultimedia-devel
+BuildRequires:  kdegraphics-devel
 
 %if 0%{?fedora} < 7
 BuildRequires: tcp_wrappers
@@ -53,46 +50,44 @@ directly from Amazon.com.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --disable-rpath --enable-webcam
-make %{?_smp_mflags}
 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+#configure --disable-rpath --enable-webcam
+make %{?_smp_mflags}  -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
-  lang=$(basename $lang_dir)
-  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
-done
+make install/fast DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
+%find_lang %{name} --with-kde
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category X-Fedora                           \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*
-
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
 
 %postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  update-mime-database %{_kde4_datadir}/mime &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
+gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,19 +95,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{_bindir}/*
-%{_datadir}/applications/kde/tellico.desktop
-%{_datadir}/apps/kconf_update/
-%{_datadir}/config.kcfg/tellico_config.kcfg
-%{_datadir}/config/tellicorc
-%{_datadir}/apps/tellico/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/application/x-tellico.desktop
-%{_datadir}/mime/packages/tellico.xml
+%doc AUTHORS ChangeLog COPYING
+%{_kde4_bindir}/tellico
+%{_kde4_datadir}/applications/kde4/tellico.desktop
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/tellico/
+%{_kde4_datadir}/config.kcfg/tellico_config.kcfg
+%{_kde4_configdir}/tellicorc
+%{_kde4_configdir}/tellico-script.knsrc
+%{_kde4_configdir}/tellico-template.knsrc
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_datadir}/mimelnk/application/x-tellico.desktop
+%{_kde4_datadir}/mime/packages/tellico.xml
 
 
 %changelog
+* Mon Sep 21 2009 José Matos <jamatos at fc.up.pt> - 2.0-1
+- stable release
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
+- use %%_kde4_* macros
+- optimize scriptlets
+- update URL, Source0
+
+* 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
+
 * Thu Mar  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.3.5-1
 - Update to latest upstream (1.3.5)
 - Add a patch from upstream SVN r3410 which fixes build with GCC 4.4


--- tellico-1.3.5-gcc44.patch DELETED ---