packages: scidavis/scidavis.spec, scidavis/scidavis-manual-0.1_2008-02-28.t...

blues blues at pld-linux.org
Mon Oct 5 15:21:39 CEST 2009 

Author: blues                        Date: Mon Oct  5 13:21:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter

---- Files affected:
packages/scidavis:
   scidavis.spec (1.1 -> 1.2) , scidavis-manual-0.1_2008-02-28.tar.bz2 (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/scidavis/scidavis.spec
diff -u packages/scidavis/scidavis.spec:1.1 packages/scidavis/scidavis.spec:1.2
--- packages/scidavis/scidavis.spec:1.1	Mon Oct  5 15:16:40 2009
+++ packages/scidavis/scidavis.spec	Mon Oct  5 15:21:34 2009
@@ -1,24 +1,33 @@
+# $Revision$, $Date$
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.2.3
-Release: 	5%{?dist}
-Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
-Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
-Patch0:		scidavis-0.2.3-manual.patch
-Patch1:		scidavis-0.2.3-pro.patch
+Release:	5%{?dist}
+Source0:	http://dl.sourceforge.net/scidavis/%{name}-%{version}.tar.bz2
+Source1:	http://dl.sourceforge.net/scidavis/%{name}-manual-0.1_2008-02-28.tar.bz2
+Patch0:		%{name}-0.2.3-manual.patch
+Patch1:		%{name}-0.2.3-pro.patch
+License:	GPL v2
+Group:		Applications/Engineering
 URL:		http://scidavis.sourceforge.net/
-License:	GPLv2
-Group: 		Applications/Engineering
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: gsl-devel python-devel muParser-devel qwt-devel qwtplot3d-qt4-devel qt4-devel sip-devel PyQt4-devel dos2unix
-Requires: hicolor-icon-theme
+BuildRequires:	desktop-file-utils
+BuildRequires:	qwtplot3d-qt4-devel
+BuildRequires:	qt4-devel
+BuildRequires:	sip-devel
+BuildRequires:	PyQt4-devel
+BuildRequires:	dos2unix
+BuildRequires:	gsl-devel
+BuildRequires:	python-devel
+BuildRequires:	muParser-devel
+BuildRequires:	qwt-devel
+Requires:	hicolor-icon-theme
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-SciDAVis is a user-friendly data analysis and visualization program primarily
-aimed at high-quality plotting of scientific data. It strives to combine an
-intuitive, easy-to-use graphical user interface with powerful features such
-as Python scriptability.
+SciDAVis is a user-friendly data analysis and visualization program
+primarily aimed at high-quality plotting of scientific data. It
+strives to combine an intuitive, easy-to-use graphical user interface
+with powerful features such as Python scriptability.
 
 %package manual
 Summary:	Additional manual for SciDAVis
@@ -37,28 +46,29 @@
 %build
 cd scidavis
 qmake-qt4 scidavis.pro
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd scidavis
-rm -rf %{buildroot}
-make INSTALL_ROOT="%{buildroot}" install
-install -d %{buildroot}%{_datadir}/applications
+rm -rf $RPM_BUILD_ROOT
+%{__make} INSTALL_ROOT="$RPM_BUILD_ROOT" install
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 desktop-file-install --vendor fedora \
-	--dir %{buildroot}%{_datadir}/applications \
-	%{buildroot}/%{_datadir}/applications/scidavis.desktop
+	--dir $RPM_BUILD_ROOT%{_desktopdir} \
+	$RPM_BUILD_ROOT/%{_desktopdir}/scidavis.desktop
 
-rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
+rm $RPM_BUILD_ROOT/%{_desktopdir}/scidavis.desktop
 
-install -d %{buildroot}%{_datadir}/%{name}/translations
-install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/translations
+install -D -pm 644 translations/*.qm $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/
 
-mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
-mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
-cp %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/.
-cp %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/.
-mv %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
+mkdir $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/mimetypes/
+mkdir $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/mimetypes/
+cp $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/scidavis.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/mimetypes/.
+cp $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/scidavis.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/mimetypes/.
+mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/mimetypes/scidavis.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
+mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/mimetypes/scidavis.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -77,76 +87,34 @@
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
+%defattr(644,root,root,755)
 %doc CHANGES README gpl.txt
 %exclude %{_sysconfdir}/scidavisrc.pyo
 %exclude %{_sysconfdir}/scidavisrc.pyc
-%{_bindir}/scidavis
+%attr(755,root,root) %{_bindir}/scidavis
 #%{_libdir}/scidavis/
-%{_datadir}/applications/*
+%{_desktopdir}/*
 %{_datadir}/mime/packages/scidavis.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-sciprj*
-%{_datadir}/icons/hicolor/*/apps/scidavis.*
-%{_datadir}/icons/locolor/*/apps/scidavis.*
+%{_iconsdir}/hicolor/*/mimetypes/application-x-sciprj*
+%{_iconsdir}/hicolor/*/apps/scidavis.*
+%{_iconsdir}/locolor/*/apps/scidavis.*
 %{_datadir}/scidavis
 %{_sysconfdir}/scidavisrc.py
 
 %files manual
-%defattr(-,root,root,-)
+%defattr(644,root,root,755)
 %doc manual/*
 
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
-* Sun Jul 19 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-5
-- Rebuild
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
 
-* Sun Jul 19 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-4
-- Rebuild
+$Log$
+Revision 1.2  2009/10/05 13:21:34  blues
+- adapter
 
-* Fri Jul 17 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-3
-- Patch for manual path
-
-* Mon Jul 13 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-2
-- BZ #510968
-
-* Sun Jul 05 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-1
-- Update to 0.2.3
-
-* Wed Apr 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.2-1
-- Update to 0.2.2
-
-* Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
-- Update to 0.2.1
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Feb 09 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.4-1
-- Update to 0.1.4
-
-* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-7
-- Replace the sip patch by a better one from upstream
-
-* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
-- Replace the sip patch by the one from upstream
-
-* Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
-- Rebuild
-
-* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
-- sip patch (#479118)
-
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.3-3
-- Rebuild for Python 2.6
-
-* Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-2
-- Handle correctly the icons
-
-* Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-1
-- Update to 0.1.3
-
-* Mon Feb 25 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.2-1
-- Initial build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scidavis/scidavis.spec?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list