rpms/fglrx-kmod/F-9 fglrx-kmod.spec,1.2,1.3
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3298/F-9
Modified Files:
fglrx-kmod.spec
Log Message:
Remove make.sh from the build process (thanks kwizart for the patch!)
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-kmod.spec 16 Oct 2008 23:48:18 -0000 1.2
+++ fglrx-kmod.spec 17 Oct 2008 13:53:04 -0000 1.3
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.543
-Release: 0.2.%{ativersion}%{?dist}.1
+Release: 0.3.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -25,7 +25,6 @@
Source11: fglrx-kmodtool-excludekernel-filterfile
# These control kernel version detection
Patch1: fglrx-makefile.diff
-Patch2: fglrx-makesh.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +73,6 @@
# These control kernel version detection
pushd fglrxpkg/lib/modules/fglrx/build_mod/
%patch1 -b .patch1
-%patch2 -b .patch2
popd
for kernel_version in %{?kernel_versions} ; do
@@ -84,13 +82,8 @@
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/
- export AS_USER=y
- export KERNEL_PATH="${kernel_version##*___}"
- export FEDORA_UNAME_R="${kernel_version%%___*}"
- export FEDORA_UNAME_M="%{_target_cpu}"
- export CC="gcc"
- bash make.sh verbose
+ pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
+ make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}"
popd
done
@@ -108,6 +101,9 @@
%changelog
+* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 8.543-0.3.8.11beta.1
+- Drop the make.sh layer
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.2.8.11beta.1
- Update patches
16 years
rpms/fglrx-kmod/F-8 fglrx-kmod.spec,1.3,1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3298/F-8
Modified Files:
fglrx-kmod.spec
Log Message:
Remove make.sh from the build process (thanks kwizart for the patch!)
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-8/fglrx-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fglrx-kmod.spec 16 Oct 2008 23:48:18 -0000 1.3
+++ fglrx-kmod.spec 17 Oct 2008 13:53:04 -0000 1.4
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.542
-Release: 2.%{ativersion}%{?dist}.1
+Release: 3.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -25,7 +25,6 @@
Source11: fglrx-kmodtool-excludekernel-filterfile
# These control kernel version detection
Patch1: fglrx-makefile.diff
-Patch2: fglrx-makesh.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +73,6 @@
# These control kernel version detection
pushd fglrxpkg/lib/modules/fglrx/build_mod/
%patch1 -b .patch1
-%patch2 -b .patch2
popd
for kernel_version in %{kernel_versions} ; do
@@ -84,13 +82,8 @@
%build
for kernel_version in %{kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/
- export AS_USER=y
- export KERNEL_PATH="${kernel_version##*___}"
- export FEDORA_UNAME_R="${kernel_version%%___*}"
- export FEDORA_UNAME_M="%{_target_cpu}"
- export CC="gcc"
- bash make.sh verbose
+ pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
+ make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}"
popd
done
@@ -108,6 +101,9 @@
%changelog
+* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 8.542-3.8.10.1
+- Drop the make.sh layer
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-2.8.10.1
- Update patches
16 years
rpms/fglrx-kmod/devel fglrx-kmod.spec,1.3,1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3298/devel
Modified Files:
fglrx-kmod.spec
Log Message:
Remove make.sh from the build process (thanks kwizart for the patch!)
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fglrx-kmod.spec 17 Oct 2008 12:35:44 -0000 1.3
+++ fglrx-kmod.spec 17 Oct 2008 13:53:04 -0000 1.4
@@ -84,6 +84,7 @@
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}"
+ popd
done
@@ -100,6 +101,9 @@
%changelog
+* Fri Oct 17 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.3.8.11beta.2
+- Add the missing "popd"
+
* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 8.543-0.3.8.11beta.1
- Drop the make.sh layer
16 years
rpms/fglrx-kmod/devel fglrx-kmod.spec,1.2,1.3
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31367
Modified Files:
fglrx-kmod.spec
Log Message:
Drop make.sh layer
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-kmod.spec 16 Oct 2008 23:48:18 -0000 1.2
+++ fglrx-kmod.spec 17 Oct 2008 12:35:44 -0000 1.3
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.543
-Release: 0.2.%{ativersion}%{?dist}.1
+Release: 0.3.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -25,7 +25,6 @@
Source11: fglrx-kmodtool-excludekernel-filterfile
# These control kernel version detection
Patch1: fglrx-makefile.diff
-Patch2: fglrx-makesh.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +73,6 @@
# These control kernel version detection
pushd fglrxpkg/lib/modules/fglrx/build_mod/
%patch1 -b .patch1
-%patch2 -b .patch2
popd
for kernel_version in %{?kernel_versions} ; do
@@ -84,14 +82,8 @@
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/
- export AS_USER=y
- export KERNEL_PATH="${kernel_version##*___}"
- export FEDORA_UNAME_R="${kernel_version%%___*}"
- export FEDORA_UNAME_M="%{_target_cpu}"
- export CC="gcc"
- bash make.sh verbose
- popd
+ pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
+ make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}"
done
@@ -108,6 +100,9 @@
%changelog
+* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 8.543-0.3.8.11beta.1
+- Drop the make.sh layer
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.2.8.11beta.1
- Update patches
16 years
rpms/mplayer/F-8 mplayer-nodvdcss.patch, NONE, 1.1 mplayer.spec, 1.4, 1.5 sources, 1.2, 1.3
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18662
Modified Files:
mplayer.spec sources
Added Files:
mplayer-nodvdcss.patch
Log Message:
- remove libdvdcss copy from the source tarball
mplayer-nodvdcss.patch:
--- NEW FILE mplayer-nodvdcss.patch ---
diff -up mplayer-export-2008-08-18/configure.nodvdcss mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.nodvdcss 2008-10-17 10:01:45.000000000 +0200
+++ mplayer-export-2008-08-18/configure 2008-10-17 10:01:45.000000000 +0200
@@ -587,7 +587,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
-_libdvdcss_internal=auto
+_libdvdcss_internal=no
_xanim=auto
_real=auto
_live=auto
diff -up mplayer-export-2008-08-18/Makefile.nodvdcss mplayer-export-2008-08-18/Makefile
--- mplayer-export-2008-08-18/Makefile.nodvdcss 2008-10-17 10:01:45.000000000 +0200
+++ mplayer-export-2008-08-18/Makefile 2008-10-17 10:02:13.000000000 +0200
@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
- libdvdcss/device.c \
- libdvdcss/error.c \
- libdvdcss/ioctl.c \
- libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
@@ -678,7 +673,6 @@ DIRS = . \
libavcodec/sparc \
libavformat \
libavutil \
- libdvdcss \
libfaad2 \
libmenu \
libmpcodecs \
@@ -784,7 +778,6 @@ mencoder.d mplayer.d vobsub.d gui/win32/
$(DEPS): help_mp.h
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-8/mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer.spec 12 Oct 2008 20:52:05 -0000 1.4
+++ mplayer.spec 17 Oct 2008 08:27:59 -0000 1.5
@@ -7,7 +7,7 @@
Name: mplayer
Version: 1.0
-Release: 0.97.%{pre}%{?dist}
+Release: 0.97.%{pre}%{?dist}.1
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -19,6 +19,7 @@
Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
+Source10: mplayer-snapshot.sh
Patch2: %{name}-config.patch
Patch5: %{name}-x86_32-compile.patch
Patch8: %{name}-manlinks.patch
@@ -26,6 +27,7 @@
Patch11: %{name}-dvdread.patch
Patch12: %{name}-man-zh_CN.patch
Patch13: %{name}-CVE-2008-3827.patch
+Patch14: %{name}-nodvdcss.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -150,6 +152,7 @@
%patch11 -p1 -b .dvdread
%patch12 -p1 -b .man-zh_CN
%patch13 -p0 -b .cve
+%patch14 -p1 -b .nodvdcss
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -406,6 +409,9 @@
%changelog
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn.1
+- remove libdvdcss copy from the source tarball
+
* Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
- backport the fix for CVE-2008-3827
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Aug 2008 15:17:48 -0000 1.2
+++ sources 17 Oct 2008 08:27:59 -0000 1.3
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-f09caa71435c9c8818c2f681722042a7 mplayer-export-2008-08-18.tar.bz2
+25725d45060aae8e15f06d05d004b758 mplayer-export-2008-08-18.tar.bz2
16 years
rpms/qmc2/devel qmc2.spec,1.8,1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12106
Modified Files:
qmc2.spec
Log Message:
Fix rawhide properly
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qmc2.spec 17 Oct 2008 06:11:34 -0000 1.8
+++ qmc2.spec 17 Oct 2008 06:23:29 -0000 1.9
@@ -29,7 +29,7 @@
%prep
%setup -qn %{name}
%patch1 -p0 -b .ini~
-%{__mv} arch/Linux/Fedora_release_9.91.cfg arch/Linux/Fedora_release_9.92
+%{__mv} arch/Linux/Fedora_release_9.91.cfg arch/Linux/Fedora_release_9.92.cfg
# create qmc2 desktop file
cat > %{name}.desktop << EOF
16 years
rpms/qmc2/devel qmc2.spec,1.7,1.8
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11247
Modified Files:
qmc2.spec
Log Message:
Fix up for latest rawhide
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmc2.spec 16 Oct 2008 21:15:59 -0000 1.7
+++ qmc2.spec 17 Oct 2008 06:11:34 -0000 1.8
@@ -29,6 +29,7 @@
%prep
%setup -qn %{name}
%patch1 -p0 -b .ini~
+%{__mv} arch/Linux/Fedora_release_9.91.cfg arch/Linux/Fedora_release_9.92
# create qmc2 desktop file
cat > %{name}.desktop << EOF
16 years
rpms/qmc2/F-8 qmc2-rsync.patch,1.1,1.2
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8728
Modified Files:
qmc2-rsync.patch
Log Message:
Updated the rsync patch to match the whitespace changes
qmc2-rsync.patch:
Index: qmc2-rsync.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-8/qmc2-rsync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qmc2-rsync.patch 14 Sep 2008 21:10:18 -0000 1.1
+++ qmc2-rsync.patch 17 Oct 2008 05:27:37 -0000 1.2
@@ -1,11 +1,11 @@
---- qmc2/arch/default.cfg.rsync 2007-12-21 18:43:28.000000000 +0100
-+++ qmc2/arch/default.cfg 2008-09-14 23:06:44.000000000 +0200
+--- qmc2/arch/default.cfg.rsync~ 2008-09-21 17:09:20.000000000 +0200
++++ qmc2/arch/default.cfg 2008-10-17 07:22:55.000000000 +0200
@@ -9,7 +9,7 @@
- TIME = time
- CD = cd
- CP = cp
--RSYNC = rsync -rlpt
-+RSYNC = rsync -rlp
- DATE = date +%Y%m%d%H%M%S
- SED = sed
- COLRM = colrm
+ TIME = time
+ CD = cd
+ CP = cp
+-RSYNC = rsync -rlpt
++RSYNC = rsync -rlp
+ DATE = date +%Y%m%d%H%M%S
+ SED = sed
+ COLRM = colrm
16 years
rpms/qmc2/F-8 qmc2.spec,1.11,1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7813
Modified Files:
qmc2.spec
Log Message:
rsync fix got overwritten, committing again
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-8/qmc2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmc2.spec 16 Oct 2008 21:16:10 -0000 1.11
+++ qmc2.spec 17 Oct 2008 05:08:08 -0000 1.12
@@ -11,6 +11,7 @@
Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
Source1: %{name}.png
Patch1: qmc2-ini.patch
+Patch2: qmc2-rsync.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -29,6 +30,7 @@
%prep
%setup -qn %{name}
%patch1 -p0 -b .ini~
+%patch2 -p1 -b .rsync~
# create qmc2 desktop file
cat > %{name}.desktop << EOF
@@ -104,6 +106,7 @@
* Tue Aug 19 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.6.b4
- Added phonon-devel to BuildRequires
- Cleaned up BuildRequires and Requires
+- Added rsync failure workaround
* Tue Aug 19 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.5.b4
- Updated to 0.2b4
16 years