scm-commits December 2013

scm-commits@lists.fedoraproject.org

425 participants
13004 discussions

[paraview] Add needed type casts for NULL usage on 32-bit
by Orion Poplawski 31 Dec '13

31 Dec '13

commit 0dfd618acf75b19c7011b00389022edc97c19cba Author: Orion Poplawski <orion(a)nwra.com> Date: Tue Dec 31 16:54:23 2013 -0700 Add needed type casts for NULL usage on 32-bit paraview-cstddef.patch | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) --- diff --git a/paraview-cstddef.patch b/paraview-cstddef.patch index 0e84544..ac723b0 100644 --- a/paraview-cstddef.patch +++ b/paraview-cstddef.patch @@ -1,6 +1,6 @@ -diff -up ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddeff ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx ---- ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddeff 2013-12-24 19:17:44.000000000 -0700 -+++ ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx 2013-12-30 15:19:14.469386213 -0700 +diff -up ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddef ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx +--- ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddef 2013-12-24 19:17:44.000000000 -0700 ++++ ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx 2013-12-31 14:42:48.313911486 -0700 @@ -33,6 +33,7 @@ #include "vtkgl.h" #include "vtkMPI.h" @@ -9,3 +9,15 @@ diff -up ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.c #include <list> #include <deque> #include <vector> +@@ -1272,9 +1273,9 @@ int vtkPSurfaceLICComposite::Gather( + vector<MPI_Request> mpiSendReqs; + deque<MPI_Datatype> mpiTypes; + #ifdef PBO_RECV_BUFFERS +- deque<vtkPixelBufferObject*> recvPBOs(nTransactions, NULL); ++ deque<vtkPixelBufferObject*> recvPBOs(nTransactions, static_cast<vtkPixelBufferObject*>(NULL)); + #else +- deque<void*> recvBufs(nTransactions, NULL); ++ deque<void*> recvBufs(nTransactions, static_cast<void*>(NULL)); + #endif + for (int j=0; j<nTransactions; ++j) + {

1 0

[mate-backgrounds/f18: 4/4] Merge branch 'f20' into f18
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

commit 645c3c9cd38502e77593fcc4084f4f81ff1842e7 Merge: 3f7a6fd 2a9b16e Author: raveit65 <chat-to-me(a)raveit.de> Date: Wed Jan 1 00:50:54 2014 +0100 Merge branch 'f20' into f18 .gitignore | 1 + mate-backgrounds.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) ---

1 0

[mate-backgrounds/f18] (4 commits) ...Merge branch 'f20' into f18
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

Summary of changes: 01df807... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*) ba33c49... add 1.6.1 release (*) 2a9b16e... add 1.6.1 release to spec file (*) 645c3c9... Merge branch 'f20' into f18 (*) This commit already existed in another branch; no separate mail sent

1 0

[mate-backgrounds/f19] (3 commits) ...add 1.6.1 release to spec file
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

Summary of changes: 01df807... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*) ba33c49... add 1.6.1 release (*) 2a9b16e... add 1.6.1 release to spec file (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[mate-backgrounds/f20] add 1.6.1 release to spec file
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

commit 2a9b16eea4022d5b9ebc153e460b658e3d61229a Author: raveit65 <chat-to-me(a)raveit.de> Date: Wed Jan 1 00:33:17 2014 +0100 add 1.6.1 release to spec file mate-backgrounds.spec | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) --- diff --git a/mate-backgrounds.spec b/mate-backgrounds.spec index 5e7bd4c..370428b 100644 --- a/mate-backgrounds.spec +++ b/mate-backgrounds.spec @@ -1,6 +1,6 @@ Name: mate-backgrounds -Version: 1.6.0 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: MATE Desktop backgrounds License: GPLv2+ URL: http://mate-desktop.org @@ -14,8 +14,6 @@ Backgrounds for MATE Desktop %prep %setup -q -NOCONFIGURE=1 ./autogen.sh - %build %configure @@ -32,6 +30,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/backgrounds/mate %changelog +* Tue Dec 31 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.1-1 +- update to 1.6.1 release + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

1 0

[mate-backgrounds/f20] add 1.6.1 release
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

commit ba33c499082140b5941d87a2ee217d2238375874 Author: raveit65 <chat-to-me(a)raveit.de> Date: Wed Jan 1 00:32:35 2014 +0100 add 1.6.1 release .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/.gitignore b/.gitignore index 581c881..89f0a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mate-backgrounds-1.4.0.tar.xz /mate-backgrounds-1.5.0.tar.xz /mate-backgrounds-1.6.0.tar.xz +/mate-backgrounds-1.6.1.tar.xz diff --git a/sources b/sources index dd62a16..9220a7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b05ee6b9ef8faecb3fe95140526569cb mate-backgrounds-1.6.0.tar.xz +8764956a8a0fe4831906911806280b76 mate-backgrounds-1.6.1.tar.xz

1 0

File mate-backgrounds-1.6.1.tar.xz uploaded to lookaside cache by raveit65
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

A file has been added to the lookaside cache for mate-backgrounds: 8764956a8a0fe4831906911806280b76 mate-backgrounds-1.6.1.tar.xz

1 0

[GMT] - Update to 5.1.0 - Disable octave support - removed from upstream for now - Drop xgridedit sub-pack
by Orion Poplawski 31 Dec '13

31 Dec '13

commit 57b84b207e12b34612d81b0e6d55b2e613dba631 Author: Orion Poplawski <orion(a)nwra.com> Date: Tue Dec 31 16:27:30 2013 -0700 - Update to 5.1.0 - Disable octave support - removed from upstream for now - Drop xgridedit sub-package - removed from upstream GMT.spec | 133 ++++++++++++++++++++------------------------------------------ sources | 2 +- 2 files changed, 44 insertions(+), 91 deletions(-) --- diff --git a/GMT.spec b/GMT.spec index f8da7ba..ccc0f73 100644 --- a/GMT.spec +++ b/GMT.spec @@ -1,8 +1,8 @@ -%global gmthome %{_datadir}/GMT -%global gmtconf %{_sysconfdir}/GMT +%global gmthome %{_datadir}/gmt +%global gmtconf %{_sysconfdir}/gmt %global gmtdoc %{_docdir}/gmt -%bcond_without octave +%bcond_with octave %if %with octave %{!?octave_api: %define octave_api %(octave-config -p API_VERSION 2>/dev/null || echo 0)} %define octave_mdir %(octave-config -p LOCALAPIFCNFILEDIR || echo) @@ -10,19 +10,21 @@ %endif Name: GMT -Version: 4.5.11 -Release: 2%{?dist} +Version: 5.1.0 +Release: 1%{?dist} Summary: Generic Mapping Tools -Group: Applications/Engineering -License: GPLv2+ +License: LGPLv3+ URL: http://gmt.soest.hawaii.edu/ Source0: ftp://ftp.soest.hawaii.edu/gmt/gmt-%{version}-src.tar.bz2 +BuildRequires: cmake BuildRequires: gdal-devel BuildRequires: libXt-devel libXaw-devel libXmu-devel libXext-devel BuildRequires: netcdf-devel -BuildRequires: GMT-coastlines >= 2.1.0 +BuildRequires: pcre-devel +BuildRequires: dcw-gmt +BuildRequires: gshhg-gmt-nc4 %if %with octave BuildRequires: octave-devel %endif @@ -30,12 +32,16 @@ BuildRequires: octave-devel BuildRequires: less Requires: less Requires: %{name}-common = %{version}-%{release} -Requires: GMT-coastlines >= 2.1.0 +Requires: dcw-gmt +Requires: gshhg-gmt-nc4 Provides: gmt = %{version}-%{release} %if %without octave -Obsoletes: GMT-octave <= %{version}-%{release} +Obsoletes: GMT-octave <= 4.5.11 %endif +# Do not generate provides for plugins +%global __provides_exclude_from ^%{_libdir}/gmt/.*\\.so$ + %description GMT is an open source collection of ~60 tools for manipulating geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting, @@ -56,7 +62,6 @@ with: GMT <function> [args] %package common Summary: Common files for %{name} -Group: Applications/Engineering Provides: gmt-common = %{version}-%{release} BuildArch: noarch @@ -67,9 +72,9 @@ Mapping Tools) package. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Provides: gmt-devel = %{version}-%{release} +Obsoletes: GMT-static <= 4.5.11 %description devel The %{name}-devel package contains libraries and header files for @@ -78,7 +83,6 @@ developing applications that use %{name}. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} Provides: gmt-doc = %{version}-%{release} Provides: %{name}-examples = %{version}-%{release} @@ -90,21 +94,9 @@ The %{name}-doc package provides the documentation for the GMT (Generic Mapping Tools) package. -%package static -Summary: Static libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Provides: gmt-static = %{version}-%{release} - -%description static -The %{name}-static package contains static libraries for developing -applications that use %{name}. - - %if %with octave %package octave Summary: Octave libraries for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: octave(api) = %{octave_api} Provides: gmt-octave = %{version}-%{release} @@ -115,80 +107,43 @@ applications that use %{name}. %endif -# X11 application in a subpackage. No .desktop file since it -# requires a file name as argument -%package -n xgridedit -Summary: GMT grid code graphical editor -Group: Applications/Engineering - -%description -n xgridedit -XGridEdit is an application for viewing and editing the numerical values in -GMT 2 dimensional grids. - - %prep %setup -q -n gmt-%{version} -#We don't care about .bat files -find -name \*.bat | xargs rm %build -#So we execute do_examples.sh instead of do_examples.csh -export CSH=sh -export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/netcdf" -%configure --datadir=%{gmthome} \ - --enable-debug \ - --enable-gdal \ - --enable-shared \ +mkdir build +pushd build +%{cmake} \ + -DGSHHG_ROOT=%{_prefix} \ + -DFLOCK=on \ + -DGMT_INSTALL_MODULE_LINKS=off \ + -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \ + -DGMT_MANDIR=%{_mandir} \ + -DLICENSE_RESTRICTED=LGPL \ %if %with octave - --enable-octave --enable-mex-mdir=%{octave_mdir} \ - --enable-mex-xdir=%{octave_octdir} \ + -DGMT_OCTAVE=BOOL:ON \ %endif - --disable-rpath -make -make suppl + -DGMT_OPENMP=BOOL:ON \ + .. +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -c -p' install-all +make -C build DESTDIR=$RPM_BUILD_ROOT install #Setup configuration files mkdir -p $RPM_BUILD_ROOT%{gmtconf}/{mgg,dbase,mgd77,conf} pushd $RPM_BUILD_ROOT%{gmthome}/ # put conf files in %{gmtconf} and do links in %{gmthome} -for file in conf/*.conf conf/gmtdefaults_* mgg/gmtfile_paths dbase/grdraster.info \ +for file in conf/*.conf mgg/gmtfile_paths dbase/grdraster.info \ mgd77/mgd77_paths.txt; do mv $file $RPM_BUILD_ROOT%{gmtconf}/$file ln -s ../../../../../%{gmtconf}/$file $RPM_BUILD_ROOT%{gmthome}/$file done popd -#Don't bring in csh for the csh examples -find $RPM_BUILD_ROOT/%{gmtdoc}/examples -name \*.csh | - xargs chmod a-x - -# separate the README files that are associated with gmt main package -rm -rf __package_docs -mkdir __package_docs -cp -p src/*/README.* __package_docs -rm __package_docs/README.xgrid __package_docs/README.mex - -# Remove conflicting binaries: -rm $RPM_BUILD_ROOT%{_bindir}/triangulate - - -%check -#Cleanup from previous runs -rm -f $RPM_BUILD_DIR/%{?buildsubdir}/share/coast - -#Setup environment for the tests -export GMT_SHAREDIR=$RPM_BUILD_DIR/%{?buildsubdir}/share -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} - -#Link in the coastline data -ln -s %{gmthome}/coast $RPM_BUILD_DIR/%{?buildsubdir}/share - -#Run the examples - note that this doesn't return errors if any fail, check logs! -make run-examples +# Don't ship .bat files +find $RPM_BUILD_ROOT -name \*.bat -delete %post -p /sbin/ldconfig @@ -197,13 +152,13 @@ make run-examples %files -%doc README LICENSE.TXT ChangeLog +%doc Announcements ChangeLog COPYING.LESSERv3 COPYINGv3 LICENSE.TXT README %{_bindir}/* -%exclude %{_bindir}/xgridedit -%{_libdir}/*.so.* +%{_libdir}/*.so.5* +%{_libdir}/gmt/ %files common -%doc README __package_docs/* LICENSE.TXT ChangeLog gmt_bench-marks +%doc COPYING.LESSERv3 COPYINGv3 LICENSE.TXT %dir %{gmtconf} %dir %{gmtconf}/mgg %dir %{gmtconf}/dbase @@ -225,21 +180,19 @@ make run-examples %files doc %{gmtdoc}/ -%files static -%{_libdir}/*.a - %if %with octave %files octave %{octave_mdir}/*.m %{octave_octdir}/*.mex %endif -%files -n xgridedit -%doc src/xgrid/README.xgrid -%{_bindir}/xgridedit - %changelog +* Tue Dec 31 2013 Orion Poplawski - 5.1.0-1 +- Update to 5.1.0 +- Disable octave support - removed from upstream for now +- Drop xgridedit sub-package - removed from upstream + * Sat Dec 28 2013 Kevin Fenzi <kevin(a)scrye.com> - 4.5.11-2 - Rebuild to fix broken deps diff --git a/sources b/sources index 756f200..cf0ddd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e51a8827d9b0ce3f36cfe6be01f24931 gmt-4.5.11-src.tar.bz2 +da741319c883a3dbaf27ec7eaf66c166 gmt-5.1.0-src.tar.bz2

1 0

[mate-image-viewer/f18] (2 commits) ...add 1.6.2 release to spec file
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

Summary of changes: 1e90431... add 1.6.2 release (*) 11cd26b... add 1.6.2 release to spec file (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[mate-image-viewer/f19] (2 commits) ...add 1.6.2 release to spec file
by Wolfgang Ulbrich 31 Dec '13

31 Dec '13

Summary of changes: 1e90431... add 1.6.2 release (*) 11cd26b... add 1.6.2 release to spec file (*) (*) This commit already existed in another branch; no separate mail sent

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits December 2013