rpms/kile/FC-3 kile.spec, 1.5, 1.6 sources, 1.3, 1.4 kile-1.7-dt.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Aug 5 17:48:01 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30192
Modified Files:
kile.spec sources
Removed Files:
kile-1.7-dt.patch
Log Message:
sync w/-devel branch
Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kile.spec 13 Jan 2005 15:32:49 -0000 1.5
+++ kile.spec 5 Aug 2005 17:47:59 -0000 1.6
@@ -1,31 +1,17 @@
-#$Id$
-
-# for optionally using destkop-file-install (for fc2 mostly)
-%define desktop_file 1
+# $id: $
Name: kile
Summary: (La)TeX source editor and TeX shell
-Epoch: 0
-Version: 1.7.1
-Release: 3%{?dist_tag}
+Version: 1.8.1
+Release: 1%{?dist}
+
+License: GPL
Group: Applications/Publishing
URL: http://kile.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# 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 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
+BuildRequires: desktop-file-utils
Requires: tetex-latex
## Optional, but recommended
@@ -33,13 +19,16 @@
#Requires: xfig
BuildRequires: qt-devel >= 1:3.3
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
Requires: qt >= 1:%{qt_ver}
-
-BuildRequires: kdelibs-devel >= 6:3.2
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 )
+BuildRequires: kdelibs-devel >= 6:3.3
+%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
Requires: kdelibs >= 6:%{kdelibs_ver}
+# kile-i18n is no longer separate pkg
+Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes}
+#Provides: kile-i18n = %{epoch}:%{version}-%{release}
+
%description
Kile is a user friendly (La)TeX editor. The main features are:
* Compile, convert and view your document with one click.
@@ -54,19 +43,18 @@
%prep
-%setup -q
-
-%{?desktop_file:%patch1 -p1 -b .dt}
+%setup -q -n %{name}-%{version}%{?beta}
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
+# x86_64 fix (bug #161343)
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
%configure \
- --program-prefix="%{?_program_prefix}" \
--disable-rpath \
%{?debug: --enable-debug --enable-warnings } \
- %{!?debug: --disable-debug --disable-warnings --enable-final }
+ %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
make %{?_smp_mflags}
@@ -76,42 +64,38 @@
make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
-# Replace absolute symlinks with relative ones
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
-for lang in *; do
- if [ -d $lang ]; then
- pushd $lang
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-popd
-
-%if "%{?desktop_file}" == "1"
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
+desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category "Application" \
- --add-category "X-Fedora" \
- $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop
-%endif
+ --add-category X-Fedora \
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML
+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
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
+done
+fi
-## Unpackaged/conflicting files
+## conflicting files (with kde > 3.2)
rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO
-%lang(en) %doc %{_datadir}/doc/HTML/en/*
%{_bindir}/*
%{_datadir}/apps/kile
%{_datadir}/apps/kconf_update/kile*
-%config %{_datadir}/config.kcfg/kile.kcfg
-%{_datadir}/icons/*/*/*/*.png
-%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop
+%config %{_datadir}/config*/*
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/applications/*.desktop
%{_datadir}/mimelnk/*/*.desktop
@@ -120,6 +104,22 @@
%changelog
+* Thu Jun 02 2005 Rex Dieter 1.8.1-1
+- 1.8.1
+- x86_64 fix (bug #161343)
+
+* Tue May 31 2005 Rex Dieter 1.8-2
+- Obsoletes: kile-i18n
+
+* Mon May 23 2005 Rex Dieter 1.8-1
+- 1.8
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.7.1
+- rebuild on all arches
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Wed Jan 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:1.7.1-3
- fix (katepart) conflicts with kde >= 3.2
- update %%description
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Jan 2005 15:32:49 -0000 1.3
+++ sources 5 Aug 2005 17:47:59 -0000 1.4
@@ -1 +1 @@
-940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2
+9ac4cd9294c6aff1acca1def68923a7d kile-1.8.1.tar.bz2
--- kile-1.7-dt.patch DELETED ---
More information about the fedora-extras-commits
mailing list