rpms/tellico/devel tellico.spec, 1.38, 1.39 tellico-1.3.5-gcc44.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	tellico.spec 
Removed Files:
	tellico-1.3.5-gcc44.patch 
Log Message:
* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
- use %_kde4_* macros
- optimize scriptlets
- update URL, Source0



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- tellico.spec	12 Sep 2009 14:29:59 -0000	1.38
+++ tellico.spec	19 Sep 2009 17:42:28 -0000	1.39
@@ -1,12 +1,15 @@
+
+%define pre pre2
+
 Name:           tellico
 Version:        2.0
-Release:        0.1.pre2%{?dist}
+Release:        0.2.%{pre}%{?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}pre2.tar.bz2
+URL:            http://tellico-project.org/ 
+Source0:        http://tellico-project.org/files/tellico-%{version}%{?pre}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.2-3
@@ -49,13 +52,13 @@ directly from Amazon.com.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}%{?pre}
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
+%{cmake_kde4} ..
 popd
 
 #configure --disable-rpath --enable-webcam
@@ -63,37 +66,31 @@ make %{?_smp_mflags}  -C %{_target_platf
 
 %install
 rm -rf $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
-  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/kde4 \
-  --add-category X-Fedora                           \
   $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
@@ -102,20 +99,25 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
-%{_bindir}/*
-%{_datadir}/applications/kde4/tellico.desktop
-%{_datadir}/kde4/apps/kconf_update/
-%{_datadir}/config.kcfg/tellico_config.kcfg
-%{_datadir}/config/tellicorc
-%{_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
+%{_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
+* 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


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