[kile/el6] Sync with master.

[Alain Portal]

commit c5718a4fc6423f1ee183b74c6f3ab64e60ab996d
Author: Alain Portal <alain.portal at free.fr>
Date:   Tue Sep 27 00:25:05 2011 +0200

    Sync with master.

 .gitignore |    3 +++
 kile.spec  |   41 ++++++++++++++++++++++-------------------
 sources    |    3 +--
 3 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6bcfb0..990d9bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 kile-2.1b4.tar.bz2
 kile-translations-20100417.tar.bz2
+/kile-2.1b5.tar.bz2
+/kile-translations-20110103.tar.bz2
+/kile-2.1.tar.bz2
diff --git a/kile.spec b/kile.spec
index f7fcf9c..48a3ef2 100644
--- a/kile.spec
+++ b/kile.spec
@@ -1,20 +1,13 @@
-
-%define pre b4
-%define translationver 20100417
-
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 2.1
-Release: 0.8.%{pre}%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre}.tar.bz2
-# translations collected from revision 1115612 of
-# http://websvn.kde.org/trunk/l10n-kde4/*/messages/extragear-office
-# http://websvn.kde.org/trunk/l10n-kde4/*/docs/extragear-office
-Source1: kile-translations-%{translationver}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 BuildRequires: desktop-file-utils
@@ -28,9 +21,9 @@ Requires: tetex-latex
 %endif
 
 ## Optional/recommended, but not absolutely required.
-#Requires(hint): dvipdfmx
+#Requires: dvipdfmx
 # okular
-#Requires(hint): kdegraphics
+#Requires: kdegraphics
 
 %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 
@@ -53,13 +46,7 @@ Kile is a user friendly (La)TeX editor.  The main features are:
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre} -a 1
-
-cat kile-translations-%{translationver}/CMakeLists.txt >>CMakeLists.txt
-rm -f kile-translations-%{translationver}/CMakeLists.txt
-mv -f kile-translations-%{translationver}/po po
-mv -f kile-translations-%{translationver}/doc-translations doc-translations
-rmdir kile-translations-%{translationver}
+%setup -q -n %{name}-%{version}%{?pre}
 
 
 %build
@@ -81,7 +68,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 ## unpackaged files
 rm -rfv %{buildroot}%{_kde4_docdir}/kile
-rm -rfv %{buildroot}%{_kde4_datadir}/mimelink
 
 
 %check
@@ -90,8 +76,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/kile.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
@@ -114,6 +102,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_kde4_datadir}/config.kcfg/kile.kcfg
 %{_datadir}/dbus-1/interfaces/net.sourceforge.kile.main.xml
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_datadir}/mime/packages/kile.xml
 
 
 %clean
@@ -121,6 +110,20 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 13 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-1
+- update to 2.1 final, finally includes translations (drop extra tarball)
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.11.b5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.10.b5
+- update to 2.1b5 and matching translations (revision 1211084 from 2011-01-03)
+- drop docbook version hack and completion-kde46 patch, fixed upstream
+
+* Tue Dec 07 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.9.b4
+- backport upstream patch to make completion work with kdelibs 4.6
+- update docbook version to make doc-translations build with kdelibs 4.6
+
 * Sat Apr 17 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.8.b4
 - update translations
 
diff --git a/sources b/sources
index 2265bf4..25b6974 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8585c196b7bff68c5cffb924a98b8783  kile-2.1b4.tar.bz2
-d0f40ded64d9e5ddbd941dc72fc7cf0a  kile-translations-20100417.tar.bz2
+9f76960ee477cc95f77a31a468b66e0a  kile-2.1.tar.bz2