rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.59,1.60
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27303
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Thu Mar 21 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.10-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- VirtualBox-kmod.spec 18 Mar 2013 23:54:40 -0000 1.59
+++ VirtualBox-kmod.spec 21 Mar 2013 22:04:35 -0000 1.60
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -19,8 +19,8 @@
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.8
-Release: 1%{?prerel:.%{prerel}}%{?dist}.4
+Version: 4.2.10
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Thu Mar 21 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.10-1
+- New upstream release.
+
* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.8-1.4
- Rebuilt for kernel
@@ -110,7 +113,7 @@
* Sun Mar 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.8-1.1
Rebuilt for kernel
-* Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com>
+* Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-1
- New upstream release.
* Sat Mar 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.6-1.13
11 years, 1 month
rpms/VirtualBox/F-17 .cvsignore, 1.41, 1.42 VirtualBox-OSE-4.1.4-noupdate.patch, 1.1, 1.2 VirtualBox.spec, 1.15, 1.16 sources, 1.41, 1.42
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19947
Modified Files:
.cvsignore VirtualBox-OSE-4.1.4-noupdate.patch VirtualBox.spec
sources
Log Message:
* Sat Mar 16 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.10-1
- New upstream release.
- Drop 00-vboxvideo.conf on guest X configuration, because this is fixed a long time ago, but we keep commented just in case.
- Drop upstreamed patch VirtualBox-4.2.8-Linux_3.9.0_rc0_compile_fix.patch .
- Modified noupdate.patch as reflection on bug rfbz #2722 , to check updates one time a week and ask for updates of extensions pack and VBoxGuestAdditions. We should also review strings for better dialogs.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 6 Mar 2013 19:30:17 -0000 1.41
+++ .cvsignore 21 Mar 2013 20:07:10 -0000 1.42
@@ -1 +1 @@
-VirtualBox-4.2.8.tar.bz2
+VirtualBox-4.2.10.tar.bz2
VirtualBox-OSE-4.1.4-noupdate.patch:
UIUpdateDefs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: VirtualBox-OSE-4.1.4-noupdate.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox-OSE-4.1.4-noupdate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.4-noupdate.patch 2 Dec 2011 23:24:04 -0000 1.1
+++ VirtualBox-OSE-4.1.4-noupdate.patch 21 Mar 2013 20:07:10 -0000 1.2
@@ -16,7 +16,7 @@
populate();
PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
- m_periodIndex = index == PeriodUndefined ? Period1Day : index;
-+ m_periodIndex = index == PeriodUndefined ? PeriodNever : index;
++ m_periodIndex = index == PeriodUndefined ? Period1Week : index;
}
/* Parse 'date' value: */
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VirtualBox.spec 6 Mar 2013 19:30:17 -0000 1.15
+++ VirtualBox.spec 21 Mar 2013 20:07:10 -0000 1.16
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.2.8
+Version: 4.2.10
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -404,9 +404,10 @@
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
+# this is fix a long time
# Ideally, Xorg should autodetect this, but for some reason it no longer does
-install -m 0644 -D %{SOURCE9} \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+#install -m 0644 -D %{SOURCE9} \
+# $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%if %{enable_webservice}
install -m 0644 -D %{SOURCE10} \
@@ -419,6 +420,7 @@
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
$RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+#review this 3
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -606,7 +608,7 @@
%{_libdir}/xorg/modules/drivers/*
%{_libdir}/dri/*
%{_libdir}/VBoxOGL*.so
-%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+#{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
@@ -621,6 +623,16 @@
%changelog
+* Sat Mar 16 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.10-1
+- New upstream release.
+- Drop 00-vboxvideo.conf on guest X configuration, because this is fixed a long time ago, but we keep commented just in case.
+- Drop upstreamed patch VirtualBox-4.2.8-Linux_3.9.0_rc0_compile_fix.patch .
+- Modified noupdate.patch as reflection on bug rfbz #2722 , to check updates one time a week and ask for updates of extensions pack and VBoxGuestAdditions. We should also review strings for better dialogs.
+
+* Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-2
+- Added upstreamed patch for kernels 3.9, "That fix will be part of the next maintenance
+ release".
+
* Sat Mar 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-1
- New upstream release.
- Small fix on VirtualBox-4.2.0-mesa.patch .
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 6 Mar 2013 19:30:17 -0000 1.41
+++ sources 21 Mar 2013 20:07:10 -0000 1.42
@@ -1 +1 @@
-54e35ece40457b1a9e27dd9d0429c3a1 VirtualBox-4.2.8.tar.bz2
+99349df34caacdecbb7cf3908631c3f3 VirtualBox-4.2.10.tar.bz2
11 years, 1 month
rpms/mythtv/EL-6 mythtv.spec,1.90,1.91
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28849
Modified Files:
mythtv.spec
Log Message:
Update conditional macros to use SysV on EL systems.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mythtv.spec 15 Mar 2013 19:35:31 -0000 1.90
+++ mythtv.spec 21 Mar 2013 14:04:09 -0000 1.91
@@ -98,8 +98,6 @@
# Set "--with debug" to enable MythTV debug compile mode
%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
-# Use SystemD service by default but allow use of SysV init script.
-%define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1}
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
@@ -107,8 +105,11 @@
%if 0%{?rhel}
%define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0}
+%define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0}
+
%else
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
+%define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1}
%endif
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
11 years, 1 month
rpms/freecad/EL-6 freecad-0.13-pycxx.patch, NONE, 1.1 freecad.spec, 1.4, 1.5 sources, 1.2, 1.3 freecad-0.12-OpenCASCADE-option.patch, 1.1, NONE freecad-0.12-pycxx.patch, 1.1, NONE freecad-0.12-rm_f2c.patch, 1.1, NONE freecad-0.12-zipios.patch, 1.1, NONE freecad-StartPage.patch, 1.1, NONE freecad-cmake_Mod_fix.patch, 1.1, NONE freecad-gcc-4.7.patch, 1.1, NONE freecad-glu.patch, 1.1, NONE freecad-system_inst.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/freecad/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17922
Modified Files:
freecad.spec sources
Added Files:
freecad-0.13-pycxx.patch
Removed Files:
freecad-0.12-OpenCASCADE-option.patch freecad-0.12-pycxx.patch
freecad-0.12-rm_f2c.patch freecad-0.12-zipios.patch
freecad-StartPage.patch freecad-cmake_Mod_fix.patch
freecad-gcc-4.7.patch freecad-glu.patch
freecad-system_inst.patch
Log Message:
* Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.13-1
- Update to latest upstream release.
freecad-0.13-pycxx.patch:
FreeCAD-0.12.5284/cMake/FindPyCXX.cmake | 107 +++++++++++++++++++++++++++
freecad-0.13.a057590/CMakeLists.txt | 11 ++
freecad-0.13.a057590/src/Base/CMakeLists.txt | 18 ----
3 files changed, 121 insertions(+), 15 deletions(-)
--- NEW FILE freecad-0.13-pycxx.patch ---
diff -Naur freecad-0.13.a057590.orig/CMakeLists.txt freecad-0.13.a057590/CMakeLists.txt
--- freecad-0.13.a057590.orig/CMakeLists.txt 2013-01-12 08:10:36.000000000 -0600
+++ freecad-0.13.a057590/CMakeLists.txt 2013-01-17 16:04:52.117940071 -0600
@@ -73,6 +73,13 @@
SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
+SET(PYCXX_INCLUDE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src" CACHE PATH
+ "Path to the directory containing PyCXX's CXX/Config.hxx include file")
+SET(PYCXX_SOURCE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src/CXX" CACHE PATH
+ "Path to the directory containing PyCXX's cxxextensions.c source file")
+
# used as compiler defines
SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
@@ -201,6 +208,10 @@
find_package(ZLIB REQUIRED)
+# -------------------------------- PyCXX --------------------------------
+
+ find_package(PyCXX REQUIRED)
+
# -------------------------------- OpenCasCade --------------------------------
#first, look for OpenCASCADE Community Edition (OCE)
diff -Naur freecad-0.13.a057590.orig/src/Base/CMakeLists.txt freecad-0.13.a057590/src/Base/CMakeLists.txt
--- freecad-0.13.a057590.orig/src/Base/CMakeLists.txt 2013-01-12 08:10:36.000000000 -0600
+++ freecad-0.13.a057590/src/Base/CMakeLists.txt 2013-01-17 16:06:36.985515701 -0600
@@ -124,20 +124,6 @@
SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
endif ()
-SET(pycxx_SRCS
- ../CXX/Config.hxx
- ../CXX/cxxextensions.c
- ../CXX/cxx_extensions.cxx
- ../CXX/cxxsupport.cxx
- ../CXX/Exception.hxx
- ../CXX/Extensions.hxx
- ../CXX/IndirectPythonInterface.cxx
- ../CXX/IndirectPythonInterface.hxx
- ../CXX/Objects.hxx
- ../CXX/Version.hxx
- ../CXX/WrapPython.h
-)
-SOURCE_GROUP("pycxx" FILES ${pycxx_SRCS})
SET(FreeCADBase_XML_SRCS
AxisPy.xml
@@ -279,7 +265,6 @@
)
SET(FreeCADBase_SRCS
- ${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
${FreeCADBase_XML_SRCS}
@@ -310,6 +295,9 @@
list(APPEND FreeCADBase_SRCS ${zipios_SRCS})
endif(FREECAD_USE_EXTERNAL_ZIPIOS)
+include_directories(${PYCXX_INCLUDE_DIR})
+list(APPEND FreeCADBase_SRCS ${PYCXX_SOURCES})
+SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES})
if(MSVC)
add_definitions(-D_PreComp_)
This patch adds an option to FreeCAD's cmake to specify an external
PyCXX. PyCXX doesn't really have a standard location, so this will try
to guess a couple of places, but best is to specify on the cmake command
line:
cmake -DPYCXX_INCLUDE_DIR=/usr/include/python2.7 \
-DPYCXX_SOURCE_DIR=/usr/share/python2.7/CXX
diff -ruN FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake FreeCAD-0.12.5284/cMake/FindPyCXX.cmake
--- FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake 1969-12-31 18:00:00.000000000 -0600
+++ FreeCAD-0.12.5284/cMake/FindPyCXX.cmake 2012-06-25 01:30:25.000000000 -0500
@@ -0,0 +1,107 @@
+# Locate PyCXX headers and source files
+
+# This module defines
+# PYCXX_INCLUDE_DIR
+# PYCXX_SOURCE_DIR
+# PYCXX_FOUND
+# PYCXX_SOURCES
+#
+# The PYCXX_*_DIR variables can be set to tell this module where
+# the files are.
+
+
+# There's no standard location for PyCXX.
+#
+# The authors' example is to put it in "~\" [sic].
+#
+# Ubuntu puts the includes into /usr/include/python2.7/CXX and sources into
+# /usr/share/python2.7/CXX.
+#
+# The Zultron Fedora RPM does the same as Ubuntu.
+
+set(PYCXX_FOUND "YES")
+
+# find the header directory
+if(PYCXX_INCLUDE_DIR)
+ # headers better be in there
+ if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+else(PYCXX_INCLUDE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_INCLUDE_DIR CXX/Config.hxx
+ ${PYTHON_INCLUDE_DIR}
+ "${CMAKE_CURRENT_LIST_DIR}/..")
+ if(NOT PYCXX_INCLUDE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
+ "the location of CXX/Config.hxx")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_INCLUDE_DIR)
+endif(PYCXX_INCLUDE_DIR)
+
+# find the sources directory
+if(PYCXX_SOURCE_DIR)
+ # source directory specified, they'd better be there
+ if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+else(PYCXX_SOURCE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_SOURCE_DIR cxxextensions.c
+ "${PYCXX_INCLUDE_DIR}/CXX"
+ "${PYCXX_INCLUDE_DIR}/Src"
+ "${PYTHON_INCLUDE_DIR}/CXX"
+ "${PYTHON_INCLUDE_DIR}/Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../CXX")
+ if(NOT PYCXX_SOURCE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_SOURCE_DIR to "
+ "the location of cxxextensions.c")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_SOURCE_DIR)
+endif(PYCXX_SOURCE_DIR)
+
+# see what we've got
+if(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX found:")
+ MESSAGE(STATUS " Headers: ${PYCXX_INCLUDE_DIR}")
+ MESSAGE(STATUS " Sources: ${PYCXX_SOURCE_DIR}")
+
+ # Build the list of sources for convenience
+ set(PYCXX_SOURCES
+ ${PYCXX_SOURCE_DIR}/cxxextensions.c
+ ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
+ ${PYCXX_SOURCE_DIR}/cxxsupport.cxx
+ ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
+ )
+else(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX not found")
+endif(PYCXX_FOUND)
Index: freecad.spec
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/EL-6/freecad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freecad.spec 23 Oct 2012 19:24:01 -0000 1.4
+++ freecad.spec 21 Mar 2013 13:25:26 -0000 1.5
@@ -1,12 +1,17 @@
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
-%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web
+%global plugins Assembly Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web
+
+# Some plugins go in the Mod folder instead of lib. Deal with those here:
+%global mod_plugins Mod/PartDesign
# This revision is 0.12 final.
-%global svnrev 5284
+%global rev 1830
# Use updated cmake package on EL builds.
-%if 0%{?rhel}
+# Temporary workaround for cmake/boost bug:
+# http://public.kitware.com/Bug/view.php?id=13446
+%if 0%{?el6}
%global cmake %cmake28 -DBoost_NO_BOOST_CMAKE=ON
%endif
@@ -22,8 +27,8 @@
Name: freecad
-Version: 0.12
-Release: 9%{?dist}
+Version: 0.13
+Release: 1%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -31,45 +36,26 @@
# on OCE which is considered non-free.
License: GPLv3+ with exception
URL: http://sourceforge.net/apps/mediawiki/free-cad/
-Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{svnrev}.ta...
+Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{rev}.tar.gz
Source101: freecad.desktop
Source102: freecad.1
-# Patches 0 & 2 accepted upstream.
-# https://sourceforge.net/apps/mantisbt/free-cad/view.php?id=519
-# Fix a bunch of rpath issues and other tweaks.
-Patch0: freecad-system_inst.patch
-# Remove bundled libs from cmake configuration.
-Patch1: freecad-3rdParty.patch
-# Fix incomplete cmake config.
-Patch2: freecad-StartPage.patch
-# Fixed in svn
-Patch3: freecad-glu.patch
-# Disable unfinished modules.
-Patch4: freecad-cmake_Mod_fix.patch
-# Unbundle zipios++
-Patch5: freecad-0.12-zipios.patch
-# Patch for gcc 4.7
-Patch6: freecad-gcc-4.7.patch
-# Add build option for OpenCASCADE
-Patch7: freecad-0.12-OpenCASCADE-option.patch
-# Unbundle PyCXX
-Patch8: freecad-0.12-pycxx.patch
-# f2c is only needed for smesh, and maybe not even there
-Patch9: freecad-0.12-rm_f2c.patch
+Patch0: freecad-3rdParty.patch
+Patch1: freecad-0.13-pycxx.patch
# Utilities
-%if (0%{?rhel} == 6)
+%if 0%{?rhel}
BuildRequires: cmake28
%else
BuildRequires: cmake
%endif
-BuildRequires: doxygen graphviz swig
+BuildRequires: doxygen swig graphviz
BuildRequires: gcc-gfortran
BuildRequires: gettext
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
+BuildRequires: tbb-devel
# Development Libraries
BuildRequires: freeimage-devel
BuildRequires: libXmu-devel
@@ -102,11 +88,15 @@
%if ! %{bundled_pycxx}
BuildRequires: python-pycxx-devel
%endif
+BuildRequires: libicu-devel
+BuildRequires: python-matplotlib
# Needed for plugin support and is not a soname dependency.
Requires: python-pivy
Requires: PyQt4
Requires: hicolor-icon-theme
+Requires: python-matplotlib
+Requires: python-collada
# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
# prevent private capabilities being advertised in Provides/Requires
@@ -115,6 +105,8 @@
%filter_provides_in %{_libdir}/%{name}/lib
%filter_from_requires %{plugin_regexp}
%filter_from_provides %{plugin_regexp}
+%filter_provides_in %{_libdir}/%{name}/Mod
+%filter_requires_in %{_libdir}/%{name}/Mod
%filter_setup
}
@@ -140,22 +132,18 @@
%prep
-%setup -q -n FreeCAD-%{version}.%{svnrev}
-
-%patch0 -p1 -b .sysinst
-%patch1 -p1 -b .3rdparty
-%patch2 -p1 -b .startpage
-%patch3 -p1 -b .glufix
-%patch4 -p1 -b .modfix
-%patch5 -p1 -b .zipios
-%patch6 -p1 -b .gcc47
-%patch7 -p1 -b .OCC
+#setup -q -n FreeCAD-%{version}.%{svnrev}
+%setup -q -n freecad-%{version}.%{rev}
+%patch0 -p1 -b .3rdparty
# Remove bundled pycxx if we're not using it
%if ! %{bundled_pycxx}
-%patch8 -p1 -b .pycxx
+%patch1 -p1 -b .pycxx
rm -rf src/CXX
%endif
-%patch9 -p1 -b .f2c
+
+%if ! %{bundled_zipios}
+rm -rf src/zipios++
+%endif
# Fix encodings
dos2unix -k src/Mod/Test/unittestgui.py \
@@ -171,11 +159,14 @@
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
-%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/freecad \
+%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
+ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
+ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
+ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DRESOURCEDIR=%{_libdir}/freecad \
- -DDOCDIR=%{_docdir}/%{name} \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
-DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
+ -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
%if %{occ}
-DUSE_OCC=TRUE \
%endif
@@ -183,7 +174,7 @@
-DSMESH_INCLUDE_DIR=%{_includedir} \
%endif
%if ! %{bundled_zipios}
- -DUSE_EXTERNAL_ZIPIOS=TRUE \
+ -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \
%endif
%if ! %{bundled_pycxx}
-DPYCXX_INCLUDE_DIR=$(pkg-config --variable=includedir PyCXX) \
@@ -193,6 +184,8 @@
make %{?_smp_mflags}
+make doc
+
%install
pushd build
@@ -207,7 +200,7 @@
popd
# Fix problems with unittestgui.py
-chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py
+#chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py
# Install desktop file
desktop-file-install \
@@ -278,9 +271,9 @@
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bin/
-%{_libdir}/%{name}/data/
%{_libdir}/%{name}/lib/
%{_libdir}/%{name}/Mod/
+%{_datadir}/%{name}/
%{_mandir}/man1/*.1.gz
%files doc
@@ -288,9 +281,14 @@
%changelog
+* Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.13-1
+- Update to latest upstream release.
+
* Sat Oct 20 2012 John Morris <john(a)zultron.com> - 0.12-9
- Use cmake28 package on el6
- Remove COIN3D_DOC_PATH cmake def (one less warning during build)
+- Add PyQt as requirement.
+- Add libicu-devel as build requirement.
* Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-8
- Rebuild for boost 1.50.
@@ -305,6 +303,12 @@
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-6
- Filter out automatically generated Provides/Requires of private libraries
- freecad.desktop not passing 'desktop-file-validate'; fixed
+- Remove BuildRequires: tbb-devel and gts-devel
+- Update license tag to GPLv3+ only.
+- Add missing license files to %%doc.
+- Add missing build requirement for hicolor-icon-theme.
+- Fix excessive linking issue.
+- Other minor spec updates.
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-5
- New patch to unbundle PyCXX
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Oct 2012 18:34:23 -0000 1.2
+++ sources 21 Mar 2013 13:25:26 -0000 1.3
@@ -1 +1 @@
-fcd91286c578a219491ffebb2111bddf freecad-0.12.5284.tar.gz
+13b8fddef12f5f8419dcf4adbab596eb freecad-0.13.1830.tar.gz
--- freecad-0.12-OpenCASCADE-option.patch DELETED ---
--- freecad-0.12-pycxx.patch DELETED ---
--- freecad-0.12-rm_f2c.patch DELETED ---
--- freecad-0.12-zipios.patch DELETED ---
--- freecad-StartPage.patch DELETED ---
--- freecad-cmake_Mod_fix.patch DELETED ---
--- freecad-gcc-4.7.patch DELETED ---
--- freecad-glu.patch DELETED ---
--- freecad-system_inst.patch DELETED ---
11 years, 1 month
rpms/ffmpeg/F-19 .cvsignore, 1.41, 1.42 ffmpeg.spec, 1.79, 1.80 sources, 1.41, 1.42
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11680
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Mon Mar 18 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1.4-1
- Updated to 1.1.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 10 Mar 2013 10:59:53 -0000 1.41
+++ .cvsignore 21 Mar 2013 06:52:08 -0000 1.42
@@ -1 +1 @@
-ffmpeg-1.1.3.tar.bz2
+ffmpeg-1.1.4.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/ffmpeg.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ffmpeg.spec 10 Mar 2013 13:43:25 -0000 1.79
+++ ffmpeg.spec 21 Mar 2013 06:52:09 -0000 1.80
@@ -16,7 +16,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 1.1.3
+Version: 1.1.4
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -283,6 +283,9 @@
%changelog
+* Mon Mar 18 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1.4-1
+- Updated to 1.1.4
+
* Sun Mar 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.3-1
- Update to 1.1.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 10 Mar 2013 10:59:53 -0000 1.41
+++ sources 21 Mar 2013 06:52:09 -0000 1.42
@@ -1 +1 @@
-f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2
+4cf902c2859ffe2203465af3622f5ac9 ffmpeg-1.1.4.tar.bz2
11 years, 1 month
rpms/motion/F-19 motion.spec,1.19,1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11202/F-19
Modified Files:
motion.spec
Log Message:
Rebuilt
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- motion.spec 3 Mar 2013 21:44:04 -0000 1.19
+++ motion.spec 20 Mar 2013 22:40:45 -0000 1.20
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV534%{?dist}.6
+Release: trunkREV534%{?dist}.7
Summary: A motion detection system
Group: Applications/Multimedia
@@ -9,7 +9,8 @@
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
+Buildrequires: pkgconfig(sqlite3)
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
Requires: libv4l
Requires(post): chkconfig
@@ -28,6 +29,7 @@
%setup -q
%build
+export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
make %{?_smp_mflags}
@@ -95,6 +97,10 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.7
+- Move to ffmpeg-compat support
+- Add sqlite3
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.6
- Mass rebuilt for Fedora 19 Features
11 years, 1 month
rpms/motion/devel motion.spec,1.19,1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11077
Modified Files:
motion.spec
Log Message:
Rebuilt for F19
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- motion.spec 3 Mar 2013 21:44:04 -0000 1.19
+++ motion.spec 20 Mar 2013 22:40:06 -0000 1.20
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV534%{?dist}.6
+Release: trunkREV534%{?dist}.7
Summary: A motion detection system
Group: Applications/Multimedia
@@ -9,7 +9,8 @@
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
+Buildrequires: pkgconfig(sqlite3)
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
Requires: libv4l
Requires(post): chkconfig
@@ -28,6 +29,7 @@
%setup -q
%build
+export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
make %{?_smp_mflags}
@@ -95,6 +97,10 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.7
+- Move to ffmpeg-compat support
+- Add sqlite3
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.6
- Mass rebuilt for Fedora 19 Features
11 years, 1 month
rpms/libva-intel-driver/devel .cvsignore, 1.4, 1.5 libva-intel-driver.spec, 1.6, 1.7 sources, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-intel-driver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10633/devel
Modified Files:
.cvsignore libva-intel-driver.spec sources
Log Message:
Update to 1.0.20
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Nov 2012 18:37:46 -0000 1.4
+++ .cvsignore 20 Mar 2013 22:26:42 -0000 1.5
@@ -1 +1 @@
-intel-driver-1.0.19.tar.bz2
+libva-intel-driver-1.0.20.tar.bz2
Index: libva-intel-driver.spec
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/libva-intel-driver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libva-intel-driver.spec 9 Nov 2012 18:37:46 -0000 1.6
+++ libva-intel-driver.spec 20 Mar 2013 22:26:42 -0000 1.7
@@ -1,21 +1,20 @@
#global _with_gen4asm 1
Name: libva-intel-driver
-Version: 1.0.19
+Version: 1.0.20
Release: 1%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
License: MIT and EPL
URL: http://freedesktop.org/wiki/Software/vaapi
-Source0: http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-%{ve...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://www.freedesktop.org/software/vaapi/releases/%{name}/%{name}-%{vers...
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: libtool
%{?_with_gen4asm:BuildRequires: intel-gen4asm >= 1.2}
-BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(libudev)
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libdrm-devel >= 2.4.23
@@ -27,13 +26,14 @@
Provides: libva-freeworld = %{version}-%{release}
Obsoletes: libva-freeworld < 1.0.15
+Requires: mesa-dri-filesystem
%description
HW video decode support for Intel integrated graphics.
%prep
-%setup -q -n intel-driver-%{version}
+%setup -q
%{?_with_gen4asm:
#Move pre-built (binary) asm code
for f in src/shaders/vme/*.g?b ; do
@@ -51,7 +51,6 @@
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
find %{buildroot} -regex ".*\.la$" | xargs rm -f --
@@ -61,18 +60,16 @@
}
-%clean
-rm -rf %{buildroot}
-
-
-
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/dri/i965_drv_video.so
%changelog
+* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.20-1
+- Update to 1.0.20
+- Spec file clean-up
+
* Fri Nov 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.19-1
- Update to 1.0.19
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Nov 2012 18:37:46 -0000 1.5
+++ sources 20 Mar 2013 22:26:42 -0000 1.6
@@ -1 +1 @@
-0dd4b60e7ccca23868b7e91a29f718cf intel-driver-1.0.19.tar.bz2
+55b8e5d1126cc0f7e9df968017d21468 libva-intel-driver-1.0.20.tar.bz2
11 years, 1 month
rpms/xvid4conf/F-19 xvid4conf.spec,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xvid4conf/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9413/F-19
Modified Files:
xvid4conf.spec
Log Message:
Update for F-19 build
Index: xvid4conf.spec
===================================================================
RCS file: /cvs/free/rpms/xvid4conf/F-19/xvid4conf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xvid4conf.spec 3 Mar 2013 21:50:20 -0000 1.5
+++ xvid4conf.spec 20 Mar 2013 21:46:48 -0000 1.6
@@ -1,10 +1,8 @@
-%define desktop_vendor rpmforge
-
Summary: Tool to create XviD configuration files
Name: xvid4conf
Version: 1.12
-Release: 6%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPLv2+
Group: Applications/Multimedia
URL: http://www.exit1.org/archive/dvdrip-users/2005-07/msg00007.html
Source0: http://nexus.tfh-berlin.de/~t2/source/2.1/x/xvid4conf-%{version}.tar.bz2
@@ -26,7 +24,7 @@
Name=XviD Configurator
Comment=Create XviD configuration files to use with transcode and dvd::rip
Exec=xvid4conf
-Icon=xvid4conf.png
+Icon=xvid4conf
Terminal=false
Type=Application
Categories=Application;AudioVideo;
@@ -44,7 +42,6 @@
# Install the desktop file
desktop-file-install \
- --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
xvid4conf.desktop
@@ -61,12 +58,12 @@
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/xvid4conf
-%{_datadir}/applications/%{desktop_vendor}-xvid4conf.desktop
+%{_datadir}/applications/*xvid4conf.desktop
%{_datadir}/pixmaps/xvid4conf.png
%changelog
-* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-6
+* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-7
- Mass rebuilt for Fedora 19 Features
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-5
11 years, 1 month
rpms/xvid4conf/devel xvid4conf.spec,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xvid4conf/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9413/devel
Modified Files:
xvid4conf.spec
Log Message:
Update for F-19 build
Index: xvid4conf.spec
===================================================================
RCS file: /cvs/free/rpms/xvid4conf/devel/xvid4conf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xvid4conf.spec 3 Mar 2013 21:50:20 -0000 1.5
+++ xvid4conf.spec 20 Mar 2013 21:46:48 -0000 1.6
@@ -1,10 +1,8 @@
-%define desktop_vendor rpmforge
-
Summary: Tool to create XviD configuration files
Name: xvid4conf
Version: 1.12
-Release: 6%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPLv2+
Group: Applications/Multimedia
URL: http://www.exit1.org/archive/dvdrip-users/2005-07/msg00007.html
Source0: http://nexus.tfh-berlin.de/~t2/source/2.1/x/xvid4conf-%{version}.tar.bz2
@@ -26,7 +24,7 @@
Name=XviD Configurator
Comment=Create XviD configuration files to use with transcode and dvd::rip
Exec=xvid4conf
-Icon=xvid4conf.png
+Icon=xvid4conf
Terminal=false
Type=Application
Categories=Application;AudioVideo;
@@ -44,7 +42,6 @@
# Install the desktop file
desktop-file-install \
- --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
xvid4conf.desktop
@@ -61,12 +58,12 @@
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/xvid4conf
-%{_datadir}/applications/%{desktop_vendor}-xvid4conf.desktop
+%{_datadir}/applications/*xvid4conf.desktop
%{_datadir}/pixmaps/xvid4conf.png
%changelog
-* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-6
+* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-7
- Mass rebuilt for Fedora 19 Features
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-5
11 years, 1 month