rpms/kile/devel kile-2.0.1-xdg-open.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kile.spec, 1.40, 1.41 sources, 1.10, 1.11 kile-1.9.3-dt.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon May 12 14:40:20 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3597
Modified Files:
.cvsignore kile.spec sources
Added Files:
kile-2.0.1-xdg-open.patch
Removed Files:
kile-1.9.3-dt.patch
Log Message:
* 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
kile-2.0.1-xdg-open.patch:
--- NEW FILE kile-2.0.1-xdg-open.patch ---
diff -Nur kile-2.0.1/src/CMakeLists.txt kile-2.0.1-xdg-open/src/CMakeLists.txt
--- kile-2.0.1/src/CMakeLists.txt 2007-10-14 14:14:28.000000000 +0200
+++ kile-2.0.1-xdg-open/src/CMakeLists.txt 2008-05-11 06:23:11.000000000 +0200
@@ -127,7 +127,7 @@
INSTALL( FILES x-kilepr.desktop DESTINATION share/mimelink/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 kile2.0-4_upd.pl kile2.0-5_upd.pl DESTINATION share/apps/kconf_update )
+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 kile2.0-4_upd.pl kile2.0-5_upd.pl kile2.0.1-fedora-xdg-open_upd.pl DESTINATION share/apps/kconf_update )
IF( KILE_VERSION )
SET(_KILE_SPECIAL_DOC_DIR "share/doc/kile-${KILE_VERSION}")
diff -Nur kile-2.0.1/src/kile/kilestdtools.rc kile-2.0.1-xdg-open/src/kile/kilestdtools.rc
--- kile-2.0.1/src/kile/kilestdtools.rc 2007-10-14 14:14:28.000000000 +0200
+++ kile-2.0.1-xdg-open/src/kile/kilestdtools.rc 2008-05-11 06:24:41.000000000 +0200
@@ -487,6 +487,14 @@
from=dvi
to=dvi
+[Tool/ViewDVI/xdg-open]
+class=View
+type=Process
+command=xdg-open
+options='%target'
+from=dvi
+to=dvi
+
[Tool/ForwardDVI/Embedded Viewer]
type=Part
class=ForwardDVI
@@ -505,6 +513,14 @@
from=dvi
to=dvi
+[Tool/ForwardDVI/xdg-open]
+class=ForwardDVI
+type=Process
+command=xdg-open
+options='%target'
+from=dvi
+to=dvi
+
[Tool/ViewPDF/Embedded Viewer]
class=View
className=KGVPart
@@ -550,6 +566,15 @@
to=pdf
type=Process
+[Tool/ViewPDF/xdg-open]
+class=View
+command=xdg-open
+options='%target'
+state=Viewer
+from=pdf
+to=pdf
+type=Process
+
[Tool/ViewPS/Embedded Viewer]
class=View
className=KGVPart
@@ -577,6 +602,15 @@
to=ps
type=Process
+[Tool/ViewPS/xdg-open]
+class=View
+command=xdg-open
+options='%target'
+state=Viewer
+from=ps
+to=ps
+type=Process
+
[Tool/Lilypond/PDF]
class=Compile
command=lilypond
@@ -639,10 +673,10 @@
PDFTeX=Default
ViewBib=KBibTex
ViewHTML=Konqueror
-ViewDVI=KDVI
-ForwardDVI=KDVI
-ViewPDF=KPDF
-ViewPS=KGhostView
+ViewDVI=xdg-open
+ForwardDVI=xdg-open
+ViewPDF=xdg-open
+ViewPS=xdg-open
Lilypond=PDF
[ToolsGUI]
diff -Nur kile-2.0.1/src/kile2.0.1-fedora-xdg-open_upd.pl kile-2.0.1-xdg-open/src/kile2.0.1-fedora-xdg-open_upd.pl
--- kile-2.0.1/src/kile2.0.1-fedora-xdg-open_upd.pl 1970-01-01 01:00:00.000000000 +0100
+++ kile-2.0.1-xdg-open/src/kile2.0.1-fedora-xdg-open_upd.pl 2008-05-11 06:24:21.000000000 +0200
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+# kkofler 11/05/2008
+
+print "# DELETE [Tools]ViewDVI\n";
+print "# DELETE [Tools]ForwardDVI\n";
+print "# DELETE [Tools]ViewPDF\n";
+print "# DELETE [Tools]ViewPS\n";
+
+print <<EOT;
+
+[Tool/ViewDVI/xdg-open]
+class=View
+type=Process
+command=xdg-open
+options='%target'
+from=dvi
+to=dvi
+
+[Tool/ForwardDVI/xdg-open]
+class=ForwardDVI
+type=Process
+command=xdg-open
+options='%target'
+from=dvi
+to=dvi
+
+[Tool/ViewPDF/xdg-open]
+class=View
+command=xdg-open
+options='%target'
+state=Viewer
+from=pdf
+to=pdf
+type=Process
+
+[Tool/ViewPS/xdg-open]
+class=View
+command=xdg-open
+options='%target'
+state=Viewer
+from=ps
+to=ps
+type=Process
+
+[Tools]
+ViewDVI=xdg-open
+ForwardDVI=xdg-open
+ViewPDF=xdg-open
+ViewPS=xdg-open
+
+EOT
diff -Nur kile-2.0.1/src/kile.upd kile-2.0.1-xdg-open/src/kile.upd
--- kile-2.0.1/src/kile.upd 2007-10-14 14:14:28.000000000 +0200
+++ kile-2.0.1-xdg-open/src/kile.upd 2008-05-11 06:23:38.000000000 +0200
@@ -95,3 +95,9 @@
Options=overwrite
Group=Complete
Script=kile2.0-5_upd.pl,perl
+#
+Id=Kile2.0.1FedoraXDG
+File=kilerc
+Options=overwrite
+Group=Complete
+Script=kile2.0.1-fedora-xdg-open_upd.pl,perl
diff -Nur kile-2.0.1/src/Makefile.am kile-2.0.1-xdg-open/src/Makefile.am
--- kile-2.0.1/src/Makefile.am 2007-10-14 14:14:28.000000000 +0200
+++ kile-2.0.1-xdg-open/src/Makefile.am 2008-05-11 06:23:19.000000000 +0200
@@ -6,7 +6,7 @@
update_DATA = kile.upd
update_SCRIPTS = kile1.6_upd.pl kile1.7_upd.pl kile1.9-1_upd.pl kile1.9_upd.pl \
- kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl
+ kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl kile2.0.1-fedora-xdg-open_upd.pl
updatedir = $(kde_datadir)/kconf_update
EXTRA_DIST = kile.kdevprj admin AUTHORS COPYING ChangeLog kile-remote-control.txt README README.cwl README.MacOSX kile.lsm $(mimetypetextdata_DATA)
diff -Nur kile-2.0.1/src/Makefile.in kile-2.0.1-xdg-open/src/Makefile.in
--- kile-2.0.1/src/Makefile.in 2008-05-10 20:20:53.000000000 +0200
+++ kile-2.0.1-xdg-open/src/Makefile.in 2008-05-11 06:23:30.000000000 +0200
@@ -340,7 +340,7 @@
mimetypetextdatadir = $(kde_mimedir)/text
update_DATA = kile.upd
update_SCRIPTS = kile1.6_upd.pl kile1.7_upd.pl kile1.9-1_upd.pl kile1.9_upd.pl \
- kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl
+ kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl kile2.0.1-fedora-xdg-open_upd.pl
updatedir = $(kde_datadir)/kconf_update
EXTRA_DIST = kile.kdevprj admin AUTHORS COPYING ChangeLog kile-remote-control.txt README README.cwl README.MacOSX kile.lsm $(mimetypetextdata_DATA)
@@ -742,7 +742,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=kile1.6_upd.pl kile.upd kile1.7_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl CMakeLists.txt COPYING-DOCS Makefile.in kile1.9_upd.pl kile1.9-1_upd.pl kile2.0-2_upd.pl Kile.kdevelop uninstall.desktop bughunting.html kile2.0-1_upd.pl x-kilepr.desktop Makefile.am kile2.0-3_upd.pl
+KDE_DIST=kile1.6_upd.pl kile.upd kile1.7_upd.pl kile2.0-4_upd.pl kile2.0-5_upd.pl CMakeLists.txt COPYING-DOCS Makefile.in kile1.9_upd.pl kile1.9-1_upd.pl kile2.0-2_upd.pl Kile.kdevelop uninstall.desktop bughunting.html kile2.0-1_upd.pl x-kilepr.desktop Makefile.am kile2.0-3_upd.pl kile2.0.1-fedora-xdg-open_upd.pl
#>+ 2
docs-am:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 19 Nov 2007 13:19:37 -0000 1.9
+++ .cvsignore 12 May 2008 14:39:39 -0000 1.10
@@ -1,2 +1 @@
-kile-1.9.3.tar.bz2
-kile-2.0.tar.bz2
+kile-2.0.1.tar.bz2
Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kile.spec 15 Feb 2008 15:12:55 -0000 1.40
+++ kile.spec 12 May 2008 14:39:39 -0000 1.41
@@ -1,8 +1,8 @@
Name: kile
Summary: (La)TeX source editor and TeX shell
-Version: 2.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Publishing
@@ -10,15 +10,20 @@
Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# kile.desktop MimeTypes end with ;
-Patch1: kile-1.9.3-dt.patch
+# use xdg-open
+Patch1: kile-2.0.1-xdg-open.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
@@ -26,15 +31,14 @@
%else
Requires: tetex-latex
%endif
+Requires: xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
## 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.
@@ -56,7 +60,9 @@
%prep
%setup -q -n %{name}-%{version}%{?beta}
-%patch1 -p1 -b .dt
+%patch1 -p1 -b .xdg_open
+
+make -f admin/Makefile.common
%build
@@ -72,17 +78,17 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -97,41 +103,45 @@
fi
## conflicting files (with kde > 3.2)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
+rm -rf %{buildroot}%{_datadir}/apps/katepart
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kile.desktop
%post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/*
+%{_bindir}/kile
%{_datadir}/apps/kile/
%{_datadir}/apps/kconf_update/kile*
-%{_datadir}/config*/*
+%{_datadir}/config.kcfg/kile.kcfg
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/applications/kde/kile.desktop
+%{_datadir}/mimelnk/text/x-kilepr.desktop
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%changelog
+* 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)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 15 Feb 2008 15:12:55 -0000 1.10
+++ sources 12 May 2008 14:39:39 -0000 1.11
@@ -1 +1 @@
-78fed6091aec3f1357c69f6462528ed2 kile-2.0.tar.bz2
+1d18762b6c62fb58123b1a89bdd39fb1 kile-2.0.1.tar.bz2
--- kile-1.9.3-dt.patch DELETED ---
More information about the fedora-extras-commits
mailing list