packages: kile/kile.spec, kile/kile-cmake.patch (NEW) - Up to 2.1 beta3. Bu...

[lmasko]

Author: lmasko                       Date: Sun Feb  7 20:44:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 2.1 beta3. Builds and works on KDE 4.4.0. Probably needs adjustment
  of BRs.

---- Files affected:
packages/kile:
   kile.spec (1.47 -> 1.48) , kile-cmake.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kile/kile.spec
diff -u packages/kile/kile.spec:1.47 packages/kile/kile.spec:1.48
--- packages/kile/kile.spec:1.47	Sat Sep 20 14:50:22 2008
+++ packages/kile/kile.spec	Sun Feb  7 21:44:16 2010
@@ -2,16 +2,17 @@
 Summary:	KDE Integrated LaTeX Environment
 Summary(pl.UTF-8):	Zintegrowane środowisko LaTeXowe dla KDE
 Name:		kile
-Version:	2.0.1
-Release:	1
+Version:	2.1
+%define 	_version	2.1b3
+Release:	0.beta3.1
 License:	GPL v2
 Group:		X11/Applications/Publishing
-Source0:	http://dl.sourceforge.net/kile/%{name}-%{version}.tar.bz2
-# Source0-md5:	1d18762b6c62fb58123b1a89bdd39fb1
-Patch0:		%{name}-desktop.patch
+Source0:	http://dl.sourceforge.net/kile/%{name}-%{_version}.tar.bz2
+# Source0-md5:	5de96712686e82fa17732c0d0cf0cc3f
 URL:		http://kile.sourceforge.net/
+Patch0:		kile-cmake.patch
 BuildRequires:	automake
-BuildRequires:	kdelibs-devel >= 3.2
+BuildRequires:	kde4-kdelibs-devel >= 4.4.0
 BuildRequires:	rpmbuild(macros) >= 1.129
 Requires:	tetex-format-latex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,44 +82,44 @@
 zachować kontrolę nad dokumentami w LaTeXu.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_version}
 %patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.* admin
-%configure \
-	--disable-rpath \
-	--%{!?debug:dis}%{?debug:en}able-debug \
-	--with-qt-libraries=%{_libdir}
-
+install -d build
+cd build
+%cmake \
+        -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+	-DKILE_VERSION=%{version} \
+        ../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
-%find_lang %{name} --with-kde
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
-
 %clean
 rm -fr $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README README.cwl kile-remote-control.txt README.MacOSX
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/apps/kile
 %{_datadir}/mimelnk/text/x-kilepr.desktop
-%{_datadir}/apps/kconf_update/kile.upd
-%attr(755,root,root) %{_datadir}/apps/kconf_update/kile*_upd.pl
+%{_datadir}/apps/kconf_update/*
+#%attr(755,root,root) %{_datadir}/apps/kconf_update/kile*_upd.pl
 %{_datadir}/config.kcfg/kile.kcfg
-%{_desktopdir}/kde/kile.desktop
+%{_desktopdir}/kde4/kile.desktop
 %{_iconsdir}/*/*/apps/*.png
 %{_iconsdir}/*/*/apps/*.svgz
+%{_kdedocdir}/*
+%{_datadir}/dbus-1/interfaces/net.sourceforge.kile.main.xml
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -126,6 +127,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2010/02/07 20:44:16  lmasko
+- Up to 2.1 beta3. Builds and works on KDE 4.4.0. Probably needs adjustment
+  of BRs.
+
 Revision 1.47  2008/09/20 12:50:22  gotar
 - more specific rpm group
 

================================================================
Index: packages/kile/kile-cmake.patch
diff -u /dev/null packages/kile/kile-cmake.patch:1.1
--- /dev/null	Sun Feb  7 21:44:22 2010
+++ packages/kile/kile-cmake.patch	Sun Feb  7 21:44:16 2010
@@ -0,0 +1,11 @@
+--- kile-2.1b3/CMakeLists.txt~	2009-06-10 01:59:28.000000000 +0200
++++ kile-2.1b3/CMakeLists.txt	2010-02-07 21:27:40.000000000 +0100
+@@ -131,7 +131,7 @@
+ 
+ ########### install files ###############
+ 
+-INSTALL( FILES x-kilepr.desktop DESTINATION share/mimelink/text )
++INSTALL( FILES x-kilepr.desktop DESTINATION share/mimelnk/text )
+ 
+ INSTALL( FILES kile.upd kile1.6_upd.pl kile1.7_upd.pl kile1.9_upd.pl
+ kile1.9-1_upd.pl kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kile/kile.spec?r1=1.47&r2=1.48&f=u