rpms/kile/F-8 .cvsignore, 1.10, 1.11 kile.spec, 1.38, 1.39 sources, 1.10, 1.11

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kile/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20848/F-8

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
Oops, I didn't realize we skipped 2.0.1 and 2.0.2 already in F-8. So maybe upgrading it to 2.0.3 isn't a good idea now? I'd also have to sync the patch files so it actually builds anyway. Reverting.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Dec 2008 06:22:11 -0000	1.10
+++ .cvsignore	15 Dec 2008 06:26:27 -0000	1.11
@@ -1 +1,2 @@
-kile-2.0.3.tar.bz2
+kile-1.9.3.tar.bz2
+kile-2.0.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-8/kile.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kile.spec	15 Dec 2008 06:22:11 -0000	1.38
+++ kile.spec	15 Dec 2008 06:26:27 -0000	1.39
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 2.0.3
+Version: 2.0
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -10,35 +10,22 @@
 Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# use xdg-open
-Patch1: kile-2.0.1-xdg-open.patch
+# kile.desktop MimeTypes end with ;
+Patch1: kile-1.9.3-dt.patch
 
-BuildRequires: automake libtool
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5 
-BuildRequires: kdelibs3-devel
-# konsolepart
-Requires: kdebase3
-%else
 BuildRequires: kdelibs-devel
-# konsolepart
-Requires: kdebase
-%endif
-
-%if 0%{?fedora} > 8
-Requires: tex(latex)
-%else
-Requires: tetex-latex
-%endif
-Requires: xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
+Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
 #Requires(hint): gnuplot
 #Requires(hint): xfig
 
+# kile-i18n is no longer separate pkg
+Obsoletes: kile-i18n < %{version}=%{release}
+Provides:  kile-i18n = %{version}-%{release}
+
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
   * Compile, convert and view your document with one click.
@@ -60,9 +47,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
-%patch1 -p1 -b .xdg_open
-
-make -f admin/Makefile.common
+%patch1 -p1 -b .dt
 
 
 %build
@@ -78,17 +63,17 @@
 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=%{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -103,64 +88,41 @@
 fi
 
 ## conflicting files (with kde > 3.2)
-rm -rf %{buildroot}%{_datadir}/apps/katepart
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kile.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kile
+%{_bindir}/*
 %{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
-%{_datadir}/config.kcfg/kile.kcfg
+%{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/kile.desktop
-%{_datadir}/mimelnk/text/x-kilepr.desktop
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/mimelnk/*/*.desktop
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.3-1
-- update to 2.0.3 (#476108)
-
-* Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.2-1
-- update to 2.0.2 (#464320)
-
-* Sun Jun 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.1-2
-- also change QuickPreview to use xdg-open (#445934 reloaded)
-
-* Sun May 11 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-1
-- kile-2.0.1 (#445975)
-- kile should require: kdebase3 (#445933)
-- kpdf preview is broken (#445934)
-- drop deprecated kile-i18n references
-
-* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-4
-- respin (new tarball)
-- f9+: Requires: tex(latex)
-
-* Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0-3
-- rebuild for GCC 4.3
-
-* Thu Jan 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0-2
-- BR kdelibs3-devel (F7+, EL6+)
-
 * Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0-1
 - kile-2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Dec 2008 06:22:11 -0000	1.10
+++ sources	15 Dec 2008 06:26:27 -0000	1.11
@@ -1 +1 @@
-f0296547d3e916dd385e0b8913918852  kile-2.0.3.tar.bz2
+ace13e96226422ce5cb7d8b28d7f442a  kile-2.0.tar.bz2