Author: glen                         Date: Tue Apr  7 22:05:37 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- ehm, it compiled on second run...

---- Files affected:
SPECS:
   tellico.spec (1.59.2.1 -> 1.59.2.2) 

---- Diffs:

================================================================
Index: SPECS/tellico.spec
diff -u SPECS/tellico.spec:1.59.2.1 SPECS/tellico.spec:1.59.2.2
--- SPECS/tellico.spec:1.59.2.1 Tue Apr  7 23:57:55 2009
+++ SPECS/tellico.spec  Wed Apr  8 00:05:32 2009
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 # TODO
+# - mimelnk/x-tellico.desktop is handled how in kde4?
 # - not found:
 #   poppler-qt4.pc
 #   KSaneConfig.cmake
 #   ksane-config.cmake
-#
 #-----------------------------------------------------------------------------
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
@@ -27,17 +27,16 @@
 # tar --exclude=.svn -cjf tellico.tar.bz2 tellico/
 Source0:       %{name}.tar.bz2
 # Source0-md5: c2ccd790c5c2110d3a1dadf1c858c1b1
-Patch0:                %{name}-u64.patch
-Patch1:                %{name}-desktop.patch
+#Patch0: %{name}-u64.patch
+#Patch1: %{name}-desktop.patch
 URL:           http://www.periapsis.org/tellico/
+BuildRequires: QtSvg-devel
 BuildRequires: QtTest-devel
 BuildRequires: automoc4
 BuildRequires: cmake >= 2.6.1-2
 BuildRequires: exempi-devel
 BuildRequires: kde4-kdemultimedia-devel
 BuildRequires: kde4-kdepimlibs-devel
-#BuildRequires:        kdemultimedia-devel
-#BuildRequires:        kdepim-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-progs
 BuildRequires: libxslt-devel >= 1.0.19
@@ -83,13 +82,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
 %{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir} \
-       kde_libs_htmldir=%{_kdedocdir}
-
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{ee,et}
+       DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --with-kde
 
@@ -106,9 +100,11 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog TODO
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/mimelnk/application/x-%{name}.desktop
+#%{_datadir}/mimelnk/application/x-%{name}.desktop
+%{_datadir}/config/tellico-script.knsrc
+%{_datadir}/config/tellico-template.knsrc
 %{_datadir}/apps/kconf_update/%{name}-rename.upd
 %{_datadir}/apps/kconf_update/tellico.upd
 %{_datadir}/apps/kconf_update/tellico-1-3-update.pl
@@ -116,7 +112,7 @@
 %{_datadir}/config/tellicorc
 %{_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"`)
@@ -125,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59.2.2  2009/04/07 22:05:32  glen
+- ehm, it compiled on second run...
+
 Revision 1.59.2.1  2009/04/07 21:57:55  glen
 - 2.0 build from svn, fails (deps and code both)
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tellico.spec?r1=1.59.2.1&r2=1.59.2.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to