rpms/kile/FC-2 kile-1.7-dt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kile.spec, 1.3, 1.4 sources, 1.2, 1.3
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jan 15 09:53:23 UTC 2005
Author: scop
Update of /cvs/extras/rpms/kile/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv20143/FC-2
Modified Files:
.cvsignore kile.spec sources
Added Files:
kile-1.7-dt.patch
Log Message:
auto-import kile-1.7.1-0.fdr.3.2 on branch FC-2 from kile-1.7.1-0.fdr.3.2.src.rpm
kile-1.7-dt.patch:
--- NEW FILE kile-1.7-dt.patch ---
--- kile-1.7/kile/kile.desktop.dt 2004-05-27 01:56:00.000000000 -0500
+++ kile-1.7/kile/kile.desktop 2004-10-18 08:09:27.000000000 -0500
@@ -51,4 +51,4 @@
GenericName[xx]=xxLaTeX Frontendxx
GenericName[zh_CN]=LaTeX å端
MimeType=text/x-tex;text/x-kilepr
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:39:15 -0000 1.2
+++ .cvsignore 15 Jan 2005 09:53:21 -0000 1.3
@@ -1 +1 @@
-kile-1.6.3.tar.bz2
+kile-1.7.1.tar.bz2
Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-2/kile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kile.spec 8 Nov 2004 04:39:27 -0000 1.3
+++ kile.spec 15 Jan 2005 09:53:21 -0000 1.4
@@ -1,48 +1,62 @@
-# $Id$
+#$Id$
+
+# for optionally using destkop-file-install (for fc2 mostly)
+%define desktop_file 1
Name: kile
-Summary: LaTeX source editor and TeX shell
+Summary: (La)TeX source editor and TeX shell
Epoch: 0
-Version: 1.6.3
-Release: 0.fdr.1%{?dist_tag}.2
+Version: 1.7.1
+Release: 0.fdr.3%{?dist_tag}.2
Group: Applications/Publishing
URL: http://kile.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.6.3.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Append ; to .desktop Categories
+Patch1: kile-1.7-dt.patch
+
BuildRequires: gettext
+BuildRequires: libtool
+%{?desktop_file:BuildRequires: desktop-file-utils}
-# workarounds for missing Requires in redhat's qt-devel, kdelibs-devel
-# and to make fedora's buildsystem happy
-BuildRequires: XFree86-devel libtool
+# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel
+# and to make fedora.us's buildsystem happy
+BuildRequires: XFree86-devel
BuildRequires: libpng-devel zlib-devel libjpeg-devel
BuildRequires: arts-devel libart_lgpl-devel fam-devel
Requires: tetex-latex
+## Optional, but recommended
+#Requires: gnuplot
+#Requires: xfig
-BuildRequires: qt-devel >= 1:3.1
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
+BuildRequires: qt-devel >= 1:3.3
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
Requires: qt >= 1:%{qt_ver}
-BuildRequires: kdelibs-devel >= 6:3.1
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 )
+BuildRequires: kdelibs-devel >= 6:3.2
+%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 )
Requires: kdelibs >= 6:%{kdelibs_ver}
-%if "%{kdelibs_ver}" < "3.2"
-%define desktop_file 1
-%endif
-
%description
-Kile is a LaTeX source editor, TeX shell and GnuPlot frontend that
-simplifies the creation of LaTeX documents.
+Kile is a user friendly (La)TeX editor. The main features are:
+ * Compile, convert and view your document with one click.
+ * Auto-completion of (La)TeX commands
+ * Templates and wizards makes starting a new document very little work.
+ * Easy insertion of many standard tags and symbols and the option to define (an arbitrary number of) user defined tags.
+ * Inverse and forward search: click in the DVI viewer and jump to the corresponding LaTeX line in the editor, or jump from the editor to the corresponding page in the viewer.
+ * Finding chapter or sections is very easy, Kile constructs a list of all the chapter etc. in your document. You can use the list to jump to the corresponding section.
+ * Collect documents that belong together into a project.
+ * Easy insertion of citations and references when using projects.
+ * Advanced editing commands.
%prep
%setup -q
-# append ; to desktop_file Categories
-perl -pi -e 's at Categories(.*)Office$@Categories${1}Office\;@' */*.desktop */*/*.desktop
+%{?desktop_file:%patch1 -p1 -b .dt}
%build
@@ -52,9 +66,9 @@
--program-prefix="%{?_program_prefix}" \
--disable-rpath \
%{?debug: --enable-debug --enable-warnings } \
- %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final }
+ %{!?debug: --disable-debug --disable-warnings --enable-final }
-make %{?_smp_mflags}
+make %{?_smp_mflags}
%install
@@ -76,11 +90,6 @@
popd
%if "%{?desktop_file}" == "1"
-# Put desktop/applnk file back
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Office
-mv $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --delete-original --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -89,29 +98,20 @@
$RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop
%endif
-## Locale stuff
-# find_lang
-%find_lang %{name}
-# HTML stuff
-for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
- lang=$(basename $lang_dir)
- echo "%lang($lang) %doc %{_docdir}/HTML/${lang}/*" >> %{name}.lang
-done
+## Unpackaged/conflicting files
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
-
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO
+%lang(en) %doc %{_datadir}/doc/HTML/en/*
%{_bindir}/*
%{_datadir}/apps/kile
-%{_datadir}/apps/katepart/syntax/*.xml
+%{_datadir}/apps/kconf_update/kile*
+%config %{_datadir}/config.kcfg/kile.kcfg
%{_datadir}/icons/*/*/*/*.png
-%if "%{?desktop_file}" == "1"
-%{_datadir}/applications/*.desktop
-%else
-%{_datadir}/applications/kde/*.desktop
-%endif
+%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop
%{_datadir}/mimelnk/*/*.desktop
@@ -120,6 +120,19 @@
%changelog
+* Wed Jan 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:1.7.1-0.fdr.3
+- fix (katepart) conflicts with kde >= 3.2
+- update %%description
+
+* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:1.7.1-0.fdr.2
+- -katepart: fix conflicts with kde >= 3.3 (optional)
+
+* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:1.7.1-0.fdr.1
+- 1.7.1
+
+* Tue Sep 28 2004 Rex Dieter <rexdieter at sf.net> 0:1.6.3-0.fdr.2
+- respin (against kde-3.3)
+
* Fri May 14 2004 Rex Dieter <rexdieter at sf.net> 0:1.6.3-0.fdr.1
- 1.6.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:39:15 -0000 1.2
+++ sources 15 Jan 2005 09:53:21 -0000 1.3
@@ -1 +1 @@
-6bf238c7a80fa647d8fd4ca89c0774ef kile-1.6.3.tar.bz2
+940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2
More information about the fedora-extras-commits
mailing list