rpms/kile/devel .cvsignore, 1.12, 1.13 kile.spec, 1.47, 1.48 sources, 1.13, 1.14 kile-2.0.1-xdg-open.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kile.spec sources 
Removed Files:
	kile-2.0.1-xdg-open.patch 
Log Message:
* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.1.b1
- kile-2.1b1, kde4 version, woo!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	15 Dec 2008 05:54:49 -0000	1.12
+++ .cvsignore	17 Jun 2009 19:21:09 -0000	1.13
@@ -1 +1 @@
-kile-2.0.3.tar.bz2
+kile-2.1b1.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- kile.spec	23 Mar 2009 19:46:32 -0000	1.47
+++ kile.spec	17 Jun 2009 19:21:10 -0000	1.48
@@ -1,43 +1,31 @@
 
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define kdelibs3 kdelibs3
-%define kdebase3 kdebase3
-%else
-%define kdelibs3 kdelibs
-%define kdebase3 kdebase
-%endif
+%define pre b1
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.1
+Release: 0.1.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# use xdg-open
-Patch1: kile-2.0.1-xdg-open.patch
-
-BuildRequires: automake libtool
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: %{kdelibs3}-devel
-# konsolepart
-Requires: %{kdebase3}
+BuildRequires: kdelibs4-devel
 
 %if 0%{?fedora} > 8
 Requires: tex(latex)
 %else
 Requires: tetex-latex
 %endif
-Requires: xdg-utils
 
 ## Optional/recommended, but not absolutely required.
-#Requires(hint): gnuplot
-#Requires(hint): xfig
+#Requires(hint): dvipdfmx
+# okular
+#Requires(hint): kdegraphics
 
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
@@ -58,35 +46,30 @@ Kile is a user friendly (La)TeX editor. 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
-
-%patch1 -p1 -b .xdg_open
-
-make -f admin/Makefile.common
+%setup -q -n %{name}-%{version}%{?pre}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+  ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=%{buildroot}
 
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
 # HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
+HTML_DIR=$(kde4-config --expandvars --install html)
 if [ -d %{buildroot}$HTML_DIR ]; then
 for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
@@ -102,12 +85,13 @@ for lang_dir in %{buildroot}$HTML_DIR/* 
 done
 fi
 
-## conflicting files (with kde > 3.2)
-rm -rf %{buildroot}%{_datadir}/apps/katepart
+## unpackaged files
+rm -rfv %{buildroot}%{_kde4_docdir}/kile
+rm -rfv %{buildroot}%{_kde4_datadir}/mimelink
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kile.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/kile.desktop
 
 
 %post
@@ -115,9 +99,9 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun
 if [ $1 -eq 0 ] ; then
-    update-desktop-database -q &> /dev/null
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %posttrans
@@ -127,16 +111,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kile
-%{_datadir}/apps/kile/
-%{_datadir}/apps/kconf_update/kile*
-%{_datadir}/config.kcfg/kile.kcfg
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/kile.desktop
-# TODO/FIXME: convert to /usr/share/mime/packages/ format, or just
-# wait for kde4 version of kile. :)
-%{_datadir}/mimelnk/text/x-kilepr.desktop
+%doc AUTHORS ChangeLog COPYING README
+%doc kile-remote-control.txt
+%{_kde4_bindir}/kile
+%{_kde4_appsdir}/kile/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_datadir}/applications/kde4/kile.desktop
+%{_kde4_datadir}/config.kcfg/kile.kcfg
+%{_datadir}/dbus-1/interfaces/net.sourceforge.kile.main.xml
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %clean
@@ -144,6 +127,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.1.b1
+- kile-2.1b1, kde4 version, woo!
+
 * Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.3-3
 - optimize scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Dec 2008 05:54:49 -0000	1.13
+++ sources	17 Jun 2009 19:21:10 -0000	1.14
@@ -1 +1 @@
-f0296547d3e916dd385e0b8913918852  kile-2.0.3.tar.bz2
+9e181c43e8b07e5ed26ab13b716bfc6d  kile-2.1b1.tar.bz2


--- kile-2.0.1-xdg-open.patch DELETED ---