rpms/fityk/devel .cvsignore, 1.2, 1.3 fityk.spec, 1.8, 1.9 sources, 1.2, 1.3 fityk-gcc43.patch, 1.1, NONE

Tue Aug 18 14:38:49 UTC 2009

Author: wojdyr

Update of /cvs/pkgs/rpms/fityk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28475

Modified Files:
	.cvsignore fityk.spec sources 
Removed Files:
	fityk-gcc43.patch 
Log Message:
updated to fityk 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	19 Jul 2007 13:21:07 -0000	1.2
+++ .cvsignore	18 Aug 2009 14:38:47 -0000	1.3
@@ -1 +1 @@
-fityk-0.8.1.tar.bz2
+fityk-0.8.8.tar.bz2


Index: fityk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/fityk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fityk.spec	24 Jul 2009 22:50:39 -0000	1.8
+++ fityk.spec	18 Aug 2009 14:38:48 -0000	1.9
@@ -1,20 +1,20 @@
 Name:		fityk
 Summary:	Non-linear curve fitting and data analysis
-Version:	0.8.1
-Release:	16%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 
 Source0:	http://downloads.sourceforge.net/fityk/%{name}-%{version}.tar.bz2
 URL:		http://fityk.sourceforge.net/
-License:	GPLv2
+License:	GPLv2+
 Group:		Applications/Engineering
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch0:		%{name}-gcc43.patch
 
 BuildRequires:	gcc-c++, readline-devel, ncurses-devel, desktop-file-utils
+BuildRequires:	xylib-devel >= 0.4
 %if 0%{?mandriva_version}
-BuildRequires: libwxgtk2.6-devel
+BuildRequires: libwxgtk2.8-devel
 %else
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK-devel >= 2.8.0
 %endif
 
 Requires:	gnuplot
@@ -36,77 +36,74 @@ use of %{name}, you will need to install
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure CPPFLAGS="-DNDEBUG" %{?__cc:CC="%__cc"} %{?__cxx:CXX="%__cxx"}
+%configure CPPFLAGS="-DNDEBUG" --with-samples
+# remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{?__cc:CC="%__cc"} %{?__cxx:CXX="%__cxx"} make %{?_smp_mflags}
+make %{?_smp_mflags}
 										
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
-
-# tom says we don't want .la files in RPMs:
-rm %{buildroot}/%{_libdir}/*.la
-
-# fix wrong file permissions on dirs to be used in %doc
-chmod 755 samples
-chmod 755 doc/fitykhelp_img
-
-# install the application icon
-install -p -m644 -D %{name}.png %{buildroot}/%{_datadir}/icons/%{name}.png
-rm %{buildroot}/%{_datadir}/pixmaps/%{name}.png
-
-# install the correctly-named tipes file
-install -p -m644 -D src/wxgui/tips.txt %{buildroot}/%{_datadir}/%{name}/fityk_tips.txt
-rm %{buildroot}/%{_datadir}/%{name}/tips.txt
-
-# Fix up the included desktop file
-sed -i 's/False/false/g' fityk.desktop
-sed -i 's/Icon=fityk/Icon=fityk.png/g' fityk.desktop
-
-# Get rid of the broken one that fityk was nice enough to install for us.
-rm -rf %{buildroot}%{_datadir}/applications/fityk.desktop
-
-# Install the fixed one.
-desktop-file-install --vendor="fedora" \
---dir=%{buildroot}%{_datadir}/applications %{name}.desktop
-
-# we include directories in %%doc, but we don't want Makefiles there
-rm -f samples/Makefile* doc/fitykhelp_img/Makefile*
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# Python bindings are experimental and not packaged, remove python sample
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/*.py*
+desktop-file-validate %{buildroot}/%{_datadir}/applications/fityk.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
 %postun
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO 
-# Makefile*s from samples/ and doc/fitykhelp_img/ were removed above
-%doc samples/ 
-%doc doc/
+%doc COPYING NEWS README TODO
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/samples
 %{_bindir}/*
-%{_datadir}/%{name}/
+%{_datadir}/%{name}/*.html
+%{_datadir}/%{name}/*.css
+%{_datadir}/%{name}/fitykhelp_img/
+%{_datadir}/%{name}/samples/README
+%{_datadir}/%{name}/samples/*.dat
+%{_datadir}/%{name}/samples/*.fit
 %{_datadir}/applications/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/%{name}.*
-%{_datadir}/icons/*
+%{_datadir}/pixmaps/*
+%{_datadir}/mime/packages/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/*.so
+%{_datadir}/%{name}/samples/*.cc
 
 %changelog
+* Sat Aug 18 2009 Marcin Wojdyr <wojdyr at gmail.com> - 0.8.8-1
+- upstream license was changed from GPLv2 to GPLv2+
+- install mime files and call update-mime-database
+- use configure flag --with-samples to install samples
+- update %%doc
+- do not move program's icon from pixmaps/ to icons/
+- add xylib-devel to BuildRequires
+- add minimal wxGTK version
+- remove not needed CXX and CC variables from configure and make
+- drop obsolete changes to desktop file
+- drop obsolete patch
+- update to 0.8.8. Closes Red Hat Bugzilla bug #511758.
+  Closes Red Hat Bugzilla bug #511307.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jul 2007 13:21:07 -0000	1.2
+++ sources	18 Aug 2009 14:38:48 -0000	1.3
@@ -1 +1 @@
-f93d2ce9b9c21e0d79d69f1adb797a66  fityk-0.8.1.tar.bz2
+4b79b69ce7e3a5e10928b826b27ec868  fityk-0.8.8.tar.bz2


--- fityk-gcc43.patch DELETED ---


