rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 xorg-x11-drv-nvidia.spec, 1.58, 1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4195
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 270.41.03
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 3 Mar 2011 20:34:04 -0000 1.28
+++ .cvsignore 16 Apr 2011 13:28:10 -0000 1.29
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-270.30.run
-NVIDIA-Linux-x86_64-270.30.run
+NVIDIA-Linux-x86-270.41.03.run
+NVIDIA-Linux-x86_64-270.41.03.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 3 Mar 2011 20:34:04 -0000 1.28
+++ sources 16 Apr 2011 13:28:10 -0000 1.29
@@ -1,2 +1,2 @@
-ff319212b9ac52d645df31027c31ee45 NVIDIA-Linux-x86-270.30.run
-944741d132c16e69f1123d525ec49854 NVIDIA-Linux-x86_64-270.30.run
+4e3b54ee55c6cfa4437c12a8bd9a4250 NVIDIA-Linux-x86-270.41.03.run
+663f74f80539a3ec2d35037b657929f5 NVIDIA-Linux-x86_64-270.41.03.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xorg-x11-drv-nvidia.spec 3 Mar 2011 20:35:22 -0000 1.58
+++ xorg-x11-drv-nvidia.spec 16 Apr 2011 13:28:10 -0000 1.59
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 270.30
+Version: 270.41.03
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -110,7 +110,7 @@
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
-Requires: libvdpau%{_isa} >= 0.3
+Requires: libvdpau%{_isa} >= 0.4
Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{?epoch}:%{version}-%{release}
@@ -350,6 +350,9 @@
%changelog
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.03-1
+- Update to 270.41.03
+
* Thu Mar 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.30-1
- Update to 270.30
13 years
rpms/kdenlive/F-14 kdenlive-0.7.8-gcc46.patch,NONE,1.1
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22730
Added Files:
kdenlive-0.7.8-gcc46.patch
Log Message:
forgot to add patch file
kdenlive-0.7.8-gcc46.patch:
vectorscopegenerator.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE kdenlive-0.7.8-gcc46.patch ---
diff -up kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h.gcc kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h
--- kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h.gcc 2010-09-14 13:53:22.000000000 -0500
+++ kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h 2011-04-15 07:38:06.156395786 -0500
@@ -12,8 +12,10 @@
#define VECTORSCOPEGENERATOR_H
#include <QObject>
+#include <QtGui/QImage>
-class QImage;
+// with added QtGui/QImage above, the forward declaration below probably is no longer needed -- Rex
+// class QImage;
class QPoint;
class QPointF;
class QSize;
13 years
rpms/kdenlive/F-14 kdenlive.spec,1.5,1.6
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19571
Modified Files:
kdenlive.spec
Log Message:
* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
- update scriptlets, %_kde4_... macros/best-practices
- +Requires: kdebase-runtime (versioned)
- fix ftbfs
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-14/kdenlive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdenlive.spec 7 Apr 2011 21:02:26 -0000 1.5
+++ kdenlive.spec 16 Apr 2011 09:45:08 -0000 1.6
@@ -1,6 +1,6 @@
Name: kdenlive
Version: 0.7.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
@@ -8,18 +8,21 @@
Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch100: kdenlive-0.7.8-gcc46.patch
-BuildRequires: cmake
+BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs4-devel
BuildRequires: mlt-devel
-BuildRequires: soprano-devel
-BuildRequires: desktop-file-utils
-Requires: recordmydesktop
+
+Requires: dvdauthor
Requires: dvgrab
Requires: ffmpeg
-Requires: dvdauthor
-
+# kdebase-runtime could be reduced to kdelibs4%{?_isa} instead,
+# if you don't mind missing many niceties -- Rex
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: recordmydesktop
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -29,24 +32,34 @@
%prep
%setup -q
+%patch100 -p1 -b .gcc46
+
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
+# make palletable for %%doc later
+cp effects/README README.effects
+
+
%build
-%cmake_kde4
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-mv effects/README README.effects
+rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde
-%find_lang %{name}
%check
-desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
%clean
@@ -54,22 +67,22 @@
%post
-touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+ update-mime-database %{_datadir}/mime &> /dev/null || :
+ update-desktop-database &> /dev/null || :
fi
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
%posttrans
gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -80,15 +93,22 @@
%{_kde4_datadir}/config.kcfg/*
%{_kde4_configdir}/*
%{_kde4_datadir}/mime/packages/*
-%{_kde4_appsdir}/%{name}
+%{_kde4_appsdir}/%{name}/
%{_kde4_datadir}/kde4/services/westleypreview.desktop
-%{_kde4_datadir}/icons/hicolor/*
+# menu/pixmaps is deprecated/legacy stuff, could likely omit from packaging -- Rex
%{_kde4_datadir}/menu/%{name}
%{_kde4_datadir}/pixmaps/%{name}.xpm
-%{_kde4_datadir}/icons/oxygen/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_mandir}/man1/*.gz
+
%changelog
+* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
+- update scriptlets, %%_kde4_... macros/best-practices
+- +Requires: kdebase-runtime (versioned)
+- fix ftbfs
+
* Thu Apr 07 2011 Ryan Rix <ry(a)n.rix.si> - 0.7.8-1
- new version
13 years
rpms/kdenlive/devel kdenlive-0.7.8-gcc46.patch, NONE, 1.1 kdenlive.spec, 1.5, 1.6
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16593
Modified Files:
kdenlive.spec
Added Files:
kdenlive-0.7.8-gcc46.patch
Log Message:
* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
- update scriptlets, %_kde4_... macros/best-practices
- +Requires: kdebase-runtime (versioned)
- fix ftbfs
kdenlive-0.7.8-gcc46.patch:
vectorscopegenerator.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE kdenlive-0.7.8-gcc46.patch ---
diff -up kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h.gcc kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h
--- kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h.gcc 2010-09-14 13:53:22.000000000 -0500
+++ kdenlive-0.7.8/src/colorcorrection/vectorscopegenerator.h 2011-04-15 07:38:06.156395786 -0500
@@ -12,8 +12,10 @@
#define VECTORSCOPEGENERATOR_H
#include <QObject>
+#include <QtGui/QImage>
-class QImage;
+// with added QtGui/QImage above, the forward declaration below probably is no longer needed -- Rex
+// class QImage;
class QPoint;
class QPointF;
class QSize;
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/kdenlive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdenlive.spec 7 Apr 2011 21:09:26 -0000 1.5
+++ kdenlive.spec 16 Apr 2011 09:09:17 -0000 1.6
@@ -1,6 +1,6 @@
Name: kdenlive
Version: 0.7.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
@@ -8,18 +8,21 @@
Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch100: kdenlive-0.7.8-gcc46.patch
-BuildRequires: cmake
+BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs4-devel
BuildRequires: mlt-devel
-BuildRequires: soprano-devel
-BuildRequires: desktop-file-utils
-Requires: recordmydesktop
+
+Requires: dvdauthor
Requires: dvgrab
Requires: ffmpeg
-Requires: dvdauthor
-
+# kdebase-runtime could be reduced to kdelibs4%{?_isa} instead,
+# if you don't mind missing many niceties -- Rex
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: recordmydesktop
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -29,24 +32,34 @@
%prep
%setup -q
+%patch100 -p1 -b .gcc46
+
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
+# make palletable for %%doc later
+cp effects/README README.effects
+
+
%build
-%cmake_kde4
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-mv effects/README README.effects
+rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde
-%find_lang %{name}
%check
-desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
%clean
@@ -54,22 +67,22 @@
%post
-touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+ update-mime-database %{_datadir}/mime &> /dev/null || :
+ update-desktop-database &> /dev/null || :
fi
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
%posttrans
gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -80,15 +93,22 @@
%{_kde4_datadir}/config.kcfg/*
%{_kde4_configdir}/*
%{_kde4_datadir}/mime/packages/*
-%{_kde4_appsdir}/%{name}
+%{_kde4_appsdir}/%{name}/
%{_kde4_datadir}/kde4/services/westleypreview.desktop
-%{_kde4_datadir}/icons/hicolor/*
+# menu/pixmaps is deprecated/legacy stuff, could likely omit from packaging -- Rex
%{_kde4_datadir}/menu/%{name}
%{_kde4_datadir}/pixmaps/%{name}.xpm
-%{_kde4_datadir}/icons/oxygen/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_mandir}/man1/*.gz
+
%changelog
+* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
+- update scriptlets, %%_kde4_... macros/best-practices
+- +Requires: kdebase-runtime (versioned)
+- fix ftbfs
+
* Thu Apr 07 2011 Ryan Rix <ry(a)n.rix.si> - 0.7.8-1
- new version
13 years
rpms/openafs-kmod/devel 0001-Linux-2.6.39-deal-with-BKL-removal.patch, NONE, 1.1 0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 openafs-kmod.spec, 1.2, 1.3 sources, 1.3, 1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19465
Modified Files:
.cvsignore openafs-kmod.spec sources
Added Files:
0001-Linux-2.6.39-deal-with-BKL-removal.patch
0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch
Log Message:
* Thu Apr 14 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre4
- Update to OpenAFS 1.6.0 pre-release 4
- Applied 0001-Linux-2.6.39-deal-with-BKL-removal.patch and
0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch
to get the kmod to build on current F15 kernels.
0001-Linux-2.6.39-deal-with-BKL-removal.patch:
afs/LINUX/osi_export.c | 1 -
afs/LINUX/osi_file.c | 1 -
afs/LINUX/osi_groups.c | 2 --
afs/LINUX/osi_misc.c | 1 -
afs/LINUX/osi_nfssrv.c | 1 -
afs/LINUX/osi_vfsops.c | 1 -
afs/LINUX/osi_vnodeops.c | 1 -
afs/afs_call.c | 3 ---
afs/afs_icl.c | 3 ---
afs/afs_pag_call.c | 3 ---
afs/afs_syscall.c | 3 ---
rx/LINUX/rx_knet.c | 2 --
12 files changed, 22 deletions(-)
--- NEW FILE 0001-Linux-2.6.39-deal-with-BKL-removal.patch ---
>From 1e322b883e036fe0bd5468fe60a0431545fe2376 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sun, 27 Mar 2011 11:20:17 -0400
Subject: [PATCH 1/4] Linux: 2.6.39: deal with BKL removal
For 2.6 kernels the OpenAFS code is already BKL free, but the
corresponding header file smp_lock.h is still included in various
places. This header no longer exists, so remove all occurrences
outside of LINUX24.
Reviewed-on: http://gerrit.openafs.org/4361
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementia.org>
(cherry picked from commit 9376293634393597ac7db88593100937621f6c3f)
Change-Id: I8e7e244b2e45a7a3af0505531757b8a54a0b3d29
Reviewed-on: http://gerrit.openafs.org/4370
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementia.org>
---
src/afs/LINUX/osi_export.c | 1 -
src/afs/LINUX/osi_file.c | 1 -
src/afs/LINUX/osi_groups.c | 2 --
src/afs/LINUX/osi_misc.c | 1 -
src/afs/LINUX/osi_nfssrv.c | 1 -
src/afs/LINUX/osi_vfsops.c | 1 -
src/afs/LINUX/osi_vnodeops.c | 1 -
src/afs/afs_call.c | 3 ---
src/afs/afs_icl.c | 3 ---
src/afs/afs_pag_call.c | 3 ---
src/afs/afs_syscall.c | 3 ---
src/rx/LINUX/rx_knet.c | 1 -
12 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/afs/LINUX/osi_export.c b/src/afs/LINUX/osi_export.c
index 5b300e0..662966b 100644
--- a/src/afs/LINUX/osi_export.c
+++ b/src/afs/LINUX/osi_export.c
@@ -23,7 +23,6 @@
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_dynroot.h"
-#include <linux/smp_lock.h>
#if !defined(AFS_NONFSTRANS)
diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 4a28da6..fbd20e9 100644
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -15,7 +15,6 @@
#include "afs/sysincludes.h" /* Standard vendor system headers */
#include "afsincludes.h" /* Afs-based standard headers */
#include "afs/afs_stats.h" /* afs statistics */
-#include <linux/smp_lock.h>
#include <linux/namei.h>
#if defined(HAVE_LINUX_EXPORTFS_H)
diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 7561ecc..144f0e3 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -26,8 +26,6 @@
#include "afs/nfsclient.h"
#include "osi_compat.h"
-#include <linux/smp_lock.h>
-
#ifdef AFS_LINUX26_ONEGROUP_ENV
# define NUMPAGGROUPS 1
diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index e2af595..79fa763 100644
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -22,7 +22,6 @@
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#include <linux/smp_lock.h>
int afs_osicred_initialized = 0;
afs_ucred_t afs_osi_cred;
diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c
index 4c0553b..cde4b9b 100644
--- a/src/afs/LINUX/osi_nfssrv.c
+++ b/src/afs/LINUX/osi_nfssrv.c
@@ -21,7 +21,6 @@
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "nfsclient.h"
-#include <linux/smp_lock.h>
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index 921efac..8abe6b1 100644
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -21,7 +21,6 @@
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h"
-#include <linux/smp_lock.h>
#include "osi_compat.h"
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index f3ba62a..d8d23b5 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -30,7 +30,6 @@
#include <linux/mm_inline.h>
#endif
#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
#include <linux/writeback.h>
#include <linux/pagevec.h>
#include "afs/lock.h"
diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 5c1538e..f2778fe 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -24,9 +24,6 @@
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
-#ifdef AFS_LINUX22_ENV
-#include "h/smp_lock.h"
-#endif
#ifdef AFS_SUN510_ENV
#include "h/ksynch.h"
#include "h/sunddi.h"
diff --git a/src/afs/afs_icl.c b/src/afs/afs_icl.c
index c8547ef..7c3d175 100644
--- a/src/afs/afs_icl.c
+++ b/src/afs/afs_icl.c
@@ -24,9 +24,6 @@
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
-#ifdef AFS_LINUX22_ENV
-#include "h/smp_lock.h"
-#endif
struct afs_icl_set *afs_iclSetp = (struct afs_icl_set *)0;
diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c
index b1ea882..d61a91c 100644
--- a/src/afs/afs_pag_call.c
+++ b/src/afs/afs_pag_call.c
@@ -25,9 +25,6 @@
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
-#ifdef AFS_LINUX22_ENV
-#include "h/smp_lock.h"
-#endif
#include "rmtsys.h"
#include "pagcb.h"
diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c
index b6f6337..8ad59e9 100644
--- a/src/afs/afs_syscall.c
+++ b/src/afs/afs_syscall.c
@@ -28,9 +28,6 @@
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
-#ifdef AFS_LINUX22_ENV
-#include "h/smp_lock.h"
-#endif
#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64)) || defined(NEED_IOCTL32)
static void
diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index 590a060..942a072 100644
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -18,7 +18,6 @@
#include <linux/version.h>
#include "rx/rx_kcommon.h"
-#include "h/smp_lock.h"
#include <asm/uaccess.h>
#ifdef ADAPT_PMTU
#include <linux/errqueue.h>
--
1.7.4.1
0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch:
acinclude.m4 | 3 +++
src/afs/LINUX/osi_compat.h | 31 +++++++++++++++++++++++++++++++
src/afs/LINUX/osi_misc.c | 22 +++++++---------------
3 files changed, 41 insertions(+), 15 deletions(-)
--- NEW FILE 0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch ---
>From a8aa6f4221309f44f49cdd00acce88122f1753f6 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sun, 27 Mar 2011 10:59:55 -0400
Subject: [PATCH 2/4] Linux: 2.6.39: replace path_lookup with kern_path
path_lookup is no longer available, use kern_path instead.
Reviewed-on: http://gerrit.openafs.org/4360
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementia.org>
(cherry picked from commit 7d162266c4958b22cc45d65e3f204a96c218e5f6)
Change-Id: I1c2aba273d1d597346ecb92f75caed6b6d624454
Reviewed-on: http://gerrit.openafs.org/4371
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementia.org>
---
acinclude.m4 | 3 +++
src/afs/LINUX/osi_compat.h | 31 +++++++++++++++++++++++++++++++
src/afs/LINUX/osi_misc.c | 21 +++++++--------------
3 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 51f2f6d..1f3e498 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -848,6 +848,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
AC_CHECK_LINUX_FUNC([pagevec_lru_add_file],
[#include <linux/pagevec.h>],
[__pagevec_lru_add_file(NULL);])
+ AC_CHECK_LINUX_FUNC([path_lookup],
+ [#include <linux/namei.h>],
+ [path_lookup(NULL, 0, NULL);])
AC_CHECK_LINUX_FUNC([rcu_read_lock],
[#include <linux/rcupdate.h>],
[rcu_read_lock();])
diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index cee3ade..e4f0735 100644
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -403,4 +403,35 @@ afs_inode_setattr(struct osi_file *afile, struct iattr *newattrs) {
return code;
}
+static inline int
+afs_kern_path(char *aname, int flags, struct nameidata *nd, struct path *path) {
+#if defined(HAVE_LINUX_PATH_LOOKUP)
+ return path_lookup(aname, flags, nd);
+#else
+ return kern_path(aname, flags, path);
+#endif
+}
+
+static inline void
+afs_get_dentry_ref(struct nameidata *nd, struct path *path, struct vfsmount **mnt, struct dentry **dpp) {
+#if defined(STRUCT_NAMEIDATA_HAS_PATH)
+# if defined(HAVE_LINUX_PATH_LOOKUP)
+ *dpp = dget(nd->path.dentry);
+ if (mnt)
+ *mnt = mntget(nd->path.mnt);
+ path_put(&nd->path);
+# else
+ *dpp = dget(path->dentry);
+ if (mnt)
+ *mnt = mntget(path->mnt);
+ path_put(path);
+# endif
+#else
+ *dpp = dget(nd->dentry);
+ if (mnt)
+ *mnt = mntget(nd->mnt);
+ path_release(nd);
+#endif
+}
+
#endif /* AFS_LINUX_OSI_COMPAT_H */
diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 79fa763..1158304 100644
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -23,6 +23,8 @@
#include "afsincludes.h"
#include "afs/afs_stats.h"
+#include "osi_compat.h"
+
int afs_osicred_initialized = 0;
afs_ucred_t afs_osi_cred;
@@ -58,26 +60,17 @@ osi_lookupname_internal(char *aname, int followlink, struct vfsmount **mnt,
{
int code;
struct nameidata nd;
+ struct path path;
int flags = LOOKUP_POSITIVE;
code = ENOENT;
if (followlink)
flags |= LOOKUP_FOLLOW;
- code = path_lookup(aname, flags, &nd);
+ code = afs_kern_path(aname, flags, &nd, &path);
+
+ if (!code)
+ afs_get_dentry_ref(&nd, &path, mnt, dpp);
- if (!code) {
-#if defined(STRUCT_NAMEIDATA_HAS_PATH)
- *dpp = dget(nd.path.dentry);
- if (mnt)
- *mnt = mntget(nd.path.mnt);
- path_put(&nd.path);
-#else
- *dpp = dget(nd.dentry);
- if (mnt)
- *mnt = mntget(nd.mnt);
- path_release(&nd);
-#endif
- }
return code;
}
--
1.7.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:01:18 -0000 1.1
+++ .cvsignore 14 Apr 2011 17:08:08 -0000 1.2
@@ -0,0 +1 @@
+openafs-1.6.0pre4-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs-kmod.spec 11 Jan 2011 18:40:20 -0000 1.2
+++ openafs-kmod.spec 14 Apr 2011 17:08:08 -0000 1.3
@@ -19,22 +19,24 @@
%define kmod_name openafs
+%define pre pre4
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.4.14
-Release: 1%{?dist}
+Version: 1.6.0
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}%{pre...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
-BuildRequires: pam-devel, ncurses-devel, flex, byacc, bison
+BuildRequires: pam-devel, ncurses-devel, flex, byacc, bison, automake
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i586 i686 x86_64 ppc ppc64
@@ -43,6 +45,9 @@
# tracks in all the kernel-devel packages
BuildRequires: %{_bindir}/kmodtool
+Patch1: 0001-Linux-2.6.39-deal-with-BKL-removal.patch
+Patch2: 0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch
+
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
@@ -62,12 +67,13 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-# pushd foo-%{version}
-# #patch0 -p1 -b .suffix
-# popd
+pushd %{kmod_name}-%{version}%{pre}
+%patch1 -p1
+%patch2 -p1
+popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -102,6 +108,12 @@
%changelog
+* Thu Apr 14 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre4
+- Update to OpenAFS 1.6.0 pre-release 4
+- Applied 0001-Linux-2.6.39-deal-with-BKL-removal.patch and
+ 0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch
+ to get the kmod to build on current F15 kernels.
+
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Jan 2011 18:40:20 -0000 1.3
+++ sources 14 Apr 2011 17:08:08 -0000 1.4
@@ -1 +1 @@
-e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
+f0f34f75d539b495bd89523ac9774fde openafs-1.6.0pre4-src.tar.bz2
13 years
rpms/openafs/devel .cvsignore, 1.1, 1.2 openafs.spec, 1.7, 1.8 sources, 1.4, 1.5
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7809
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Wed Apr 13 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre4
- Update to 1.6.0 pre4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:00:07 -0000 1.1
+++ .cvsignore 14 Apr 2011 14:57:47 -0000 1.2
@@ -0,0 +1,2 @@
+openafs-1.6.0pre4-doc.tar.bz2
+openafs-1.6.0pre4-src.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openafs.spec 7 Mar 2011 19:05:30 -0000 1.7
+++ openafs.spec 14 Apr 2011 14:57:47 -0000 1.8
@@ -10,15 +10,17 @@
%define sysname amd64_linux26
%endif
+%define pre pre4
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.4.14
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://www.openafs.org/dl/openafs/%{version}/openafs-%{version}-doc.tar.bz2
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}%{pre}-src...
+Source1: http://www.openafs.org/dl/openafs/%{version}%{pre}/openafs-%{version}%{pr...
Source11: CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -26,6 +28,7 @@
BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
+BuildRequires: automake
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -87,7 +90,7 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -206,7 +209,8 @@
%files
%defattr(-, root, root, -)
-%doc src/LICENSE README NEWS README.OBSOLETE README.SECURITY
+%doc src/LICENSE README NEWS README.DEVEL README.GIT README.PTHREADED_UBIK
+%doc README.WARNINGS README-WINDOWS
%config(noreplace) %{_sysconfdir}/sysconfig/*
%{_sysconfdir}/rc.d/init.d/*
%{_bindir}/aklog
@@ -223,6 +227,7 @@
%{_bindir}/sys
%{_bindir}/pagsh
%{_bindir}/pagsh.krb
+%{_bindir}/restorevol
%{_bindir}/tokens
%{_bindir}/tokens.krb
%{_bindir}/udebug
@@ -232,13 +237,12 @@
%{_sbindir}/backup
%{_sbindir}/butc
%{_sbindir}/fstrace
-%{_sbindir}/restorevol
%{_sbindir}/rxdebug
%{_sbindir}/vos
%{_sbindir}/kas
%{_libdir}/libafsauthent.so.*
+%{_libdir}/libkopenafs.so.*
%{_libdir}/libafsrpc.so.*
-%{_libdir}/libafssetpag.so.*
/%{_lib}/security/*.so
%{_mandir}/man1/*
%{_mandir}/man5/*
@@ -262,12 +266,15 @@
%{_bindir}/udebug
%{_bindir}/xstat_fs_test
%{_libexecdir}/openafs
+%{_sbindir}/dafssync-debug
+%{_sbindir}/fssync-debug
+%{_sbindir}/salvsync-debug
+%{_sbindir}/state_analyzer
%{_sbindir}/bosserver
%{_sbindir}/fms
%{_sbindir}/prdb_check
%{_sbindir}/pt_util
%{_sbindir}/read_tape
-%{_sbindir}/restorevol
%{_sbindir}/uss
%{_sbindir}/vlclient
%{_sbindir}/vldb_check
@@ -289,15 +296,17 @@
%{_includedir}/rx
%{_includedir}/*.h
%{_sbindir}/vsys
-%{_sbindir}/kdump
%{_libdir}/libafsauthent.so
%{_libdir}/libafsrpc.so
-%{_libdir}/libafssetpag.so
+%{_libdir}/libkopenafs.so
%{_libdir}/lib*.a
%{_libdir}/afs
-
+%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Thu Apr 14 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre3
+- Update to OpenAFS 1.6.0 pre-release 4
+
* Mon Mar 07 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-3
- rpmFusion Bug #1649
- Include the static libraries in openafs-devel as they are required
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Jan 2011 18:35:19 -0000 1.4
+++ sources 14 Apr 2011 14:57:47 -0000 1.5
@@ -1,2 +1,2 @@
-4d1502afa76de966dbc16f80a51e8c6a openafs-1.4.14-doc.tar.bz2
-e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
+78a540a97ed6c355583ab07a8a95d4de openafs-1.6.0pre4-doc.tar.bz2
+f0f34f75d539b495bd89523ac9774fde openafs-1.6.0pre4-src.tar.bz2
13 years
rpms/psb-kmod/F-13 psb-kmod.spec,1.16,1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/psb-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2131
Modified Files:
psb-kmod.spec
Log Message:
Same
Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-13/psb-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- psb-kmod.spec 8 Mar 2011 07:22:03 -0000 1.16
+++ psb-kmod.spec 13 Apr 2011 15:12:35 -0000 1.17
@@ -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
-%define buildforkernels current
+%define buildforkernels newest
Name: psb-kmod
Version: 4.41.1
13 years
rpms/psb-kmod/F-14 psb-kmod.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/psb-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2020
Modified Files:
psb-kmod.spec
Log Message:
Don't build akmod for each kernel rebuilt
Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-14/psb-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- psb-kmod.spec 4 Apr 2011 05:50:42 -0000 1.11
+++ psb-kmod.spec 13 Apr 2011 15:10:54 -0000 1.12
@@ -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
-%define buildforkernels current
+%define buildforkernels newest
Name: psb-kmod
Version: 4.41.1
13 years
rpms/openshot/devel openshot-1.3.0-doc-install.diff, NONE, 1.1 openshot-1.3.0-use_mlt-melt.diff, NONE, 1.1 openshot.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17644/devel
Modified Files:
.cvsignore sources
Added Files:
openshot-1.3.0-doc-install.diff
openshot-1.3.0-use_mlt-melt.diff openshot.spec
Log Message:
Import for inital release.
openshot-1.3.0-doc-install.diff:
setup.py | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
--- NEW FILE openshot-1.3.0-doc-install.diff ---
--- openshot-1.3.0-orig/setup.py 2011-02-04 14:07:09.000000000 -0600
+++ openshot-1.3.0/setup.py 2011-02-14 14:49:17.835220961 -0600
@@ -52,6 +52,31 @@ for filepath in glob.glob("openshot/loca
filepath = filepath.replace('openshot/', '')
locale_files.append(filepath)
+# Add the help files
+help_files = []
+for path in glob.glob(os.path.join('docs', 'gnome', '*')):
+ lang = os.path.basename(path)
+ if lang == 'figures':
+ continue
+ path_xml = os.path.join('share', 'gnome', 'help', 'openshot', lang)
+ help_files.append((path_xml, glob.glob('%s/*.xml' % path)))
+
+# figures are not locale-specific
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'effects', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'effects')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'transitions', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'transitions')
+help_files.append((figures_path, figures))
+
+# OMFs are in a different directory
+omfs = glob.glob(os.path.join('docs', 'omf', '*.omf'))
+omf_path = os.path.join('share', 'omf', 'openshot')
+help_files.append((omf_path, omfs))
+
# Call the main Distutils setup command
# -------------------------------------
dist = setup(
@@ -62,7 +87,7 @@ dist = setup(
'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
'openshot.uploads' : ['logos/*.png'],
},
- data_files = os_files,
+ data_files = os_files + help_files,
**info.SETUP
)
# -------------------------------------
openshot-1.3.0-use_mlt-melt.diff:
classes/av_formats.py | 2 +-
windows/preferences.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openshot-1.3.0-use_mlt-melt.diff ---
diff -upr openshot-1.3.0-orig/openshot/classes/av_formats.py openshot-1.3.0/openshot/classes/av_formats.py
--- openshot-1.3.0-orig/openshot/classes/av_formats.py 2011-01-29 13:58:49.000000000 -0600
+++ openshot-1.3.0/openshot/classes/av_formats.py 2011-02-14 14:45:31.313113270 -0600
@@ -36,7 +36,7 @@ from language import Language_Init
class formats:
- def __init__(self, melt_command="melt"):
+ def __init__(self, melt_command="mlt-melt"):
# init melt command
self.melt_command = melt_command
diff -upr openshot-1.3.0-orig/openshot/windows/preferences.py openshot-1.3.0/openshot/windows/preferences.py
--- openshot-1.3.0-orig/openshot/windows/preferences.py 2011-01-29 22:13:46.000000000 -0600
+++ openshot-1.3.0/openshot/windows/preferences.py 2011-02-14 14:46:33.354416506 -0600
@@ -329,7 +329,7 @@ class Settings:
"default_profile" : "DV NTSC",
"project_file_type" : "ascii",
"max_history_size" : "20",
- "melt_command" : "melt",
+ "melt_command" : "mlt-melt",
"blender_command" : "blender",
"output_mode" : "sdl",
"use_stock_icons" : "Yes",
# -------------------------------------
--- NEW FILE openshot.spec ---
Name: openshot
Version: 1.3.0
Release: 3%{?dist}
Summary: A GTK based non-linear video editor
Group: Applications/Multimedia
# All files are GPLv3+ except for files under openshot/uploads/youtube which
# are ASL 2.0 and openshot/window/SimpleGtkBuilderApp.py which is LGPLv3 making
# the effective license of openshot GPLv3.
License: GPLv3
URL: http://www.openshotvideo.com/
Source0: http://launchpad.net/openshot/1.3/%{version}/+download/openshot-%{version...
Patch0: %{name}-%{version}-use_mlt-melt.diff
Patch1: %{name}-%{version}-doc-install.diff
BuildArch: noarch
#BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: python2-devel
Requires: mlt
Requires: mlt-python
Requires: notify-python
Requires: pygoocanvas
Requires: pygtk2-libglade
Requires: python(abi) >= 2.5
Requires: python-imaging
Requires: pyxdg
Requires: SDL
Requires: sox
#Requires: librsvg2
Requires: frei0r-plugins
%description
OpenShot Video Editor is a free, open-source, non-linear video editor, based on
Python, GTK, and MLT. It can edit video and audio files, composite and
transition video files, and mix multiple layers of video and audio together and
render the output in many different formats.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Don't install unnecessary stuff
sed -i -e '/lib\/mime\/packages/d' setup.py
%build
%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
# Remove unnecessary .po files
rm %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.po
rm %{buildroot}%{python_sitelib}/%{name}/locale/OpenShot/OpenShot.pot
rm %{buildroot}%{python_sitelib}/%{name}/locale/README
# We strip bad shebangs (/usr/bin/env) instead of fixing them
# since these files are not executable anyways
find %{buildroot}/%{python_sitelib} -name '*.py' \
-exec grep -q '^#!' '{}' \; -print | while read F
do
awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped
touch -r $F chopped
mv chopped $F
done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
# modify find-lang.sh to deal with gettext .mo files under
# openshot/locale
%{__sed} -e 's|/share/locale/|/%{name}/locale/|' \
/usr/lib/rpm/find-lang.sh \
> find-lang-modified.sh
sh find-lang-modified.sh %{buildroot} OpenShot %{name}.lang
find %{buildroot}%{python_sitelib}/%{name}/locale -type d | while read dir
do
echo "%%dir ${dir#%{buildroot}}" >> %{name}.lang
done
%clean
rm -rf %{buildroot}
%post
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_datadir}/gnome/help/openshot/
%{_datadir}/omf/openshot/
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py*
%{python_sitelib}/%{name}/blender
%{python_sitelib}/%{name}/classes
%{python_sitelib}/%{name}/effects
%{python_sitelib}/%{name}/export_presets
%{python_sitelib}/%{name}/images
%{python_sitelib}/%{name}/language
%{python_sitelib}/%{name}/profiles
%{python_sitelib}/%{name}/themes
%{python_sitelib}/%{name}/titles
%{python_sitelib}/%{name}/transitions
%{python_sitelib}/%{name}/uploads
%{python_sitelib}/%{name}/windows
%{python_sitelib}/*egg-info
%{_mandir}/man*/*
%changelog
* Sun Apr 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-2
- Fixed spec file for packaging guidelines compliance.
* Mon Feb 14 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-1
- Release 1.3.0
* Thu Oct 11 2010 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.2.2-1
- Release 1.2.2
* Tue Jun 22 2010 Renich Bon Ćirić <renich(a)woralelandia.com> - 1.1.3-1
- Release 1.1.3
* Tue Jan 12 2010 Zarko <zarko.pintar(a)gmail.com> - 1.0.0-1
- Release 1.0.0
* Thu Dec 04 2009 Zarko <zarko.pintar(a)gmail.com> - 0.9.54-1
- initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openshot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Apr 2011 10:51:56 -0000 1.1
+++ .cvsignore 12 Apr 2011 21:12:23 -0000 1.2
@@ -0,0 +1 @@
+openshot-1.3.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openshot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Apr 2011 10:51:56 -0000 1.1
+++ sources 12 Apr 2011 21:12:23 -0000 1.2
@@ -0,0 +1 @@
+c44a09af0874a1612ed0693f8e369172 openshot-1.3.0.tar.gz
13 years
rpms/ffmpeg/F-14 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 ffmpeg.spec, 1.35, 1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13587
Modified Files:
.cvsignore sources ffmpeg.spec
Log Message:
Update to 0.6.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 4 Jul 2010 22:19:26 -0000 1.17
+++ .cvsignore 12 Apr 2011 20:28:21 -0000 1.18
@@ -1 +1 @@
-ffmpeg-20100704.tar.bz2
+ffmpeg-0.6.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 10 Jan 2011 21:43:56 -0000 1.18
+++ sources 12 Apr 2011 20:28:21 -0000 1.19
@@ -1 +1 @@
-fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
+f7819307dad55aa0d6b40ac0e862884d ffmpeg-0.6.2.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ffmpeg.spec 10 Jan 2011 21:43:56 -0000 1.35
+++ ffmpeg.spec 12 Apr 2011 20:28:21 -0000 1.36
@@ -1,11 +1,11 @@
# TODO: add make test to %%check section
-%global svn 20110110
+#global svn 20110110
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6.1
-Release: 1.%{svn}svn%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -13,7 +13,7 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: ffmpeg-%{svn}.tar.bz2
+Source0: ffmpeg-%{version}.tar.bz2
Source1: ffmpeg-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,7 +112,7 @@
%prep
-%setup -q -n ffmpeg-%{svn}
+%setup -q -n ffmpeg-%{version}
%build
%ifarch ppc ppc64
@@ -148,8 +148,6 @@
%endif
make %{?_smp_mflags}
-make documentation
-make alltools
popd
%if 0%{!?ffmpegsuffix:1}
@@ -173,7 +171,7 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
+#install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
pushd simd
@@ -199,7 +197,7 @@
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
-%{_bindir}/qt-faststart
+#{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -230,6 +228,9 @@
%changelog
+* Wed Apr 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.2-1
+- Update to 0.6.2
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn
- 20110110 snapshot
- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
13 years