rpms/kst/EL-5 .cvsignore, 1.5, 1.6 kst.spec, 1.14, 1.15 sources, 1.5, 1.6
Matthew D Truch
mtruch at fedoraproject.org
Sun Sep 27 19:04:23 UTC 2009
Author: mtruch
Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29140
Modified Files:
.cvsignore kst.spec sources
Log Message:
New kst with appropriate tweaks to get it to compile on EL-5.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 20 Oct 2006 22:31:25 -0000 1.5
+++ .cvsignore 27 Sep 2009 19:04:19 -0000 1.6
@@ -1 +1 @@
-kst-1.3.1.tar.gz
+kst-1.8.0.tar.gz
Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kst.spec 25 Jan 2009 17:26:34 -0000 1.14
+++ kst.spec 27 Sep 2009 19:04:20 -0000 1.15
@@ -1,23 +1,25 @@
Name: kst
-Version: 1.3.1
-Release: 6%{?dist}
+Version: 1.8.0
+Release: 4%{?dist}
Summary: A data viewing program for KDE
Group: Applications/Engineering
-License: GPLv2+
+License: GPLv3
URL: http://kst.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: kst-autotools.diff
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: gettext
-BuildRequires: gsl-devel readline-devel ncurses-devel
-BuildRequires: kdebindings-devel kdebase-devel
+BuildRequires: gsl-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: kdelibs-devel
BuildRequires: cfitsio-devel netcdf-devel
+BuildRequires: getdata-devel muParser-devel
BuildRequires: desktop-file-utils
-BuildRequires: libutempter-devel
%description
Kst is a real-time data viewing and plotting tool with basic data analysis
@@ -42,6 +44,7 @@ Main features of kst include:
Summary: Documentation for kst
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
+#BuildArch: noarch
%description docs
Documentation, tutorial, and sample data for kst.
@@ -69,18 +72,29 @@ Requires: %{name} = %{version}-%{relea
# Hack because cfitsio won't run if it's internal library version
# doesn't perfectly match between installed library and compiled
# against library. Meh.
-Requires: cfitsio = %(rpm -q cfitsio --qf %{V})
+#Requires: cfitsio = %(rpm -q cfitsio --qf %{V})
+Requires: cfitsio = %(pkg-config --modversion cfitsio 2>/dev/null || echo 0)
%description fits
A plugin allowing kst to open and read data and images contained within
fits files. This includes healpix encoded fits files, and lfiio data.
+%package getdata
+Summary: getdata datasource plugin for kst
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
+%description getdata
+A plugin allowing kst to open and read data in getdata (dirfile) format.
+
%prep
%setup -q
+%patch0 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export KDEDIR=%{_prefix}
+#autoreconf
%configure --disable-dependency-tracking --disable-static \
--disable-rpath \
--with-qt-libraries=$QTDIR/lib \
@@ -98,9 +112,20 @@ make DESTDIR=%{buildroot} SUID_ROOT="" i
# which we can't do as kst doesn't run without them.
#find %{buildroot} -wholename '*.la' | xargs rm -f
+# Delete wmap and scuba2 datasources; it's a packaging bug at the
+# kst upstream end that they are installed in 1.8.0 (they are unfinished?).
+rm -f %{buildroot}%{_libdir}/kde3/kstdata_scuba.la \
+ %{buildroot}%{_libdir}/kde3/kstdata_scuba.so \
+ %{buildroot}%{_libdir}/kde3/kstdata_wmap.la \
+ %{buildroot}%{_libdir}/kde3/kstdata_wmap.so \
+ %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.so \
+ %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.la \
+ %{buildroot}%{_datadir}/services/kst/kstdata_scuba.desktop \
+ %{buildroot}%{_datadir}/services/kst/kstdata_wmap.desktop \
+ %{buildroot}%{_datadir}/services/kst/kstdata_planckIDEF.desktop \
+ %{buildroot}%{_datadir}/applications/kde/kst.desktop
+
%find_lang %{name}
-%find_lang kstplugineditor
-cat kstplugineditor.lang >> %{name}.lang
# Make documentation symlinks relative
for x in %{buildroot}%{_defaultdocdir}/HTML/*/%{name}/
@@ -115,8 +140,10 @@ desktop-file-install --vendor=fedora \
--add-category Qt \
--add-category KDE \
--delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applnk/Applications/Sciences/kst.desktop
+ --dir %{buildroot}%{_datadir}/applications/ \
+ %{buildroot}%{_datadir}/applnk/Graphics/kst.desktop
+mv %{buildroot}%{_datadir}/applications/fedora-kst.desktop \
+ %{buildroot}%{_datadir}/applications/kst.desktop
%clean
rm -rf %{buildroot}
@@ -126,8 +153,8 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%files -f %{name}.lang
-%defattr(-,root,root)
-%doc ChangeLog INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
+%defattr(-,root,root,-)
+%doc INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
#binaries
%{_bindir}/kst
@@ -153,9 +180,13 @@ rm -rf %{buildroot}
%{_datadir}/services/kst/kstdata_frame.desktop
%{_datadir}/services/kst/kstdata_indirect.desktop
%{_datadir}/services/kst/kstdata_qimagesource.desktop
+%{_datadir}/services/kst/kstobject_*.desktop
%{_datadir}/servicetypes/kst/kstdatasourceplugin.desktop
+%{_datadir}/servicetypes/kst/kstbasicplugin.desktop
+%{_datadir}/servicetypes/kst/kstdataobjectplugin.desktop
#plugins
%{_libdir}/kde3/kstplugins
+%{_libdir}/kde3/kstobject_*
%dir %{_datadir}/servicetypes/kst
%{_datadir}/servicetypes/kst/kstplugin.desktop
%{_datadir}/servicetypes/kst/kstfilter.desktop
@@ -170,7 +201,7 @@ rm -rf %{buildroot}
%{_datadir}/apps/kst/kstui.rc
#desktop file
%{_datadir}/mimelnk/application/x-kst.desktop
-%{_datadir}/applications/fedora-kst.desktop
+%{_datadir}/applications/kst.desktop
#icons
%{_datadir}/icons/hicolor/22x22/actions/*.png
%{_datadir}/icons/locolor/16x16/apps/kst.png
@@ -185,7 +216,7 @@ rm -rf %{buildroot}
%{_mandir}/man1/kst.1.gz
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kstdatasource.h
%{_includedir}/kstobject.h
%{_includedir}/kst_export.h
@@ -194,15 +225,16 @@ rm -rf %{buildroot}
%{_includedir}/kstdateparser.h
%{_includedir}/kstwaitcondition.h
%{_includedir}/kstext*.h
+%{_includedir}/kstobjectcollection.h
%{_libdir}/lib*.so
%files docs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_datadir}/doc/HTML/*/kst
%{_datadir}/apps/kst/tutorial
%files fits
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/kde3/kstdata_fitsimage.*
%{_libdir}/kde3/kstdata_healpix.*
%{_libdir}/kde3/kstdata_lfiio.*
@@ -211,25 +243,120 @@ rm -rf %{buildroot}
%{_datadir}/services/kst/kstdata_lfiio.desktop
%files netcdf
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/kde3/kstdata_netcdf.*
%{_datadir}/services/kst/kstdata_netcdf.desktop
+%files getdata
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kstdata_dirfile.*
+%{_datadir}/services/kst/kstdata_dirfile.desktop
+
%changelog
-* Sun Jan 25 2009 Matthew Truch <matt at truch.net> - 1.3.1-5
-- Bump to pick up proper kjsembed.so.
+* Sun Sep 27 2009 Matthew Truch <matt at truch.net> - 1.8.0-4
+- Drop exception patch; it's not needed on EPEL-5.
+- Include autotools patch from upstream for proper building.
+- Set build for netcdf-3 libraries.
+
+* Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 1.8.0-3
+- Really fix the patch. Don't know how it wasn't fixed the first time.
+
+* Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 1.8.0-2
+- Fix patch so it doesn't require fuzz.
+
+* Sat Jul 18 2009 Matthew Truch <matt at truch.net> - 1.8.0-1
+- Upstream kst 1.8.0
+- Drop patch for saveperiod as it's included in upstream 1.8.0
+- Separate out getdata support to subpackage (requires getdata)
+- Include muParser support for general non-linear fit plugin.
+- Bump for mass rebuild.
+
+* Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 1.7.0-6
+- Make cfitsio explicit version check work.
+
+* Thu Feb 26 2009 Matthew Truch <matt at truch.net> - 1.7.0-5
+- Make documentation noarch.
+
+* Mon Feb 23 2009 Matthew Truch <matt at truch.net> - 1.7.0-4
+- Bump for mass rebuild.
+
+* Fri Oct 17 2008 Matthew Truch <matt at truch.net> - 1.7.0-3
+- Include patch from upstream to fix savePeriod.
-* Tue Dec 16 2008 Matthew Truch <matt at truch.net> - 1.3.1-4
-- Include utempter for EPEL build.
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-2
+- Allow build from netcdf version 4.
-* Thu Aug 2 2007 Matthew Truch <matt at truch.net> - 1.3.1-4
+* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 1.7.0-1
+- Update to upstream 1.7.0.
+- Re-enable ppc64 build of netcdf subpackage.
+
+* Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-4
+- ExcludeArch ppc64 for netcdf subpackage as netcdf is disabled on ppc64.
+
+* Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-3
+- Pick up patch from upstream fixing -F command line option
+ Upstream KDE svn revision 805176
+ Fixes upstream reported KDE BUG:161766
+
+* Thu Apr 24 2008 Matthew Truch <matt at truch.net> - 1.6.0-2
+- Also remove PlanckIDEF datasoure.
+
+* Thu Apr 24 2008 Matthew Truch <matt at truch.net> - 1.6.0-1
+- New version of kst.
+- Re-add gsl-devel as qt is now compatable with GPLv3.
+
+* Mon Feb 11 2008 Matthew Truch <matt at truch.net> - 1.5.0-3
+- Bump release for rebuild.
+
+* Wed Dec 12 2007 Matthew Truch <matt at truch.net> - 1.5.0-2
+- Remove BR kdebindings-devel; it is no longer provided for KDE3 in Fedora.
+ kst will use its internal kdebindings branch which is older, but should suffice.
+
+* Sun Nov 18 2007 Matthew Truch <matt at truch.net> - 1.5.0-1
+- Update to kst 1.5.0 [primarily] bugfix release
+- Remove patch to fix open() call; fix was pushed upstream.
+- Add autoreconf (and associated BR) as 1.5.0 tarball requires such.
+
+* Tue Nov 13 2007 Matthew Truch <matt at truch.net> - 1.4.0-10
+- Remove gsl-devel BuildRequires as gsl is GPLv3+ which is incompatable with qt.
+
+* Sat Nov 10 2007 Matthew Truch <matt at truch.net> - 1.4.0-9
+- Bump build to pick up new cfitsio
+
+* Tue Aug 21 2007 Matthew Truch <matt at truch.net> - 1.4.0-8
+- Add patch to fix open() call that was not compliant.
+
+* Thu Aug 2 2007 Matthew Truch <matt at truch.net> - 1.4.0-7
- Update License tag
+* Mon Jul 23 2007 Matthew Truch <matt at truch.net> - 1.4.0-6
+- Readd kdebindings-devel: KDE4 slipped; will readjust when appropriate.
+
+* Mon Jul 23 2007 Matthew Truch <matt at truch.net> - 1.4.0-5
+- kst never needed BR kdebase-devel
+- Change BR to kdelibs3-devel for upcoming switch to KDE4 as primary.
+- Remove BR kdebindings-devel; kst will use it's internal bindings which
+ should suffice until kst 2.0 is released (and switch to KDE4).
+- Fix typo in version of Jesse's changelog entry below from 1.3.0-4 to 1.4.0-4
+
+* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> - 1.4.0-4
+- Rebuild for new cfitsio
+
+* Tue May 29 2007 Matthew Truch <matt at truch.net> - 1.4.0-3
+- Recall that things get installed into %%{buildroot}
+
+* Tue May 29 2007 Matthew Truch <matt at truch.net> - 1.4.0-2
+- Remove wmap and scuba2 datasources. They shouldn't have been included
+ in the upstream release.
+
+* Thu May 17 2007 Matthew Truch <matt at truch.net> - 1.4.0-1
+- Update to kst 1.4.0 release.
+
* Mon Jan 8 2007 Matthew Truch <matt at truch.net> - 1.3.1-3
-- Bump release to pick up newest cfistio (3.030).
+- Bump release to pick up newest cfitsio (3.030).
-* Sat Jan 6 2007 Matthew Truch <matt at truch.net> - 1.3.1-2
-- Make kst-fits explicitly require cfitsio version compiled against.
+* Fri Jan 5 2007 Matthew Truch <matt at truch.net> - 1.3.1-2
+- Include explicit Requires: for cfitsio exact version compiled against.
* Fri Oct 20 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
- Update to kst 1.3.1 bugfix release.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 20 Oct 2006 22:31:25 -0000 1.5
+++ sources 27 Sep 2009 19:04:20 -0000 1.6
@@ -1 +1 @@
-b18013223dc4cc2d1d0c8c4197bf8f97 kst-1.3.1.tar.gz
+fd137c317d46e268cff630e2a9bc3461 kst-1.8.0.tar.gz
More information about the fedora-extras-commits
mailing list