rpms/ffmpeg/F-12 .cvsignore, 1.12, 1.13 ffmpeg-snapshot.sh, 1.5, 1.6 ffmpeg.spec, 1.24, 1.25 sources, 1.12, 1.13 ffmpeg-ppc-pic.patch, 1.1, NONE ffmpeg-textrel.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25787
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources
Removed Files:
ffmpeg-ppc-pic.patch ffmpeg-textrel.patch
Log Message:
* Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.1.20100425svn
- 20100425 snapshot
- drop upstream'd patch
- bumped version to pre-0.6
- added ffprobe to file list
- dropped unnecessary imlib2-devel BR
- patch to build with old x264 in F-12
- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Oct 2009 00:38:30 -0000 1.12
+++ .cvsignore 26 Apr 2010 22:44:21 -0000 1.13
@@ -1 +1 @@
-ffmpeg-20091026.tar.bz2
+ffmpeg-20100425.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-12/ffmpeg-snapshot.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ffmpeg-snapshot.sh 22 Oct 2009 15:14:52 -0000 1.5
+++ ffmpeg-snapshot.sh 26 Apr 2010 22:44:21 -0000 1.6
@@ -12,18 +12,19 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
-svn=20091019
+date=$(date +%Y%m%d)
+date=20100425
+svn={$date}
cd "$tmp"
-svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
-cd ffmpeg-$svn
+svn checkout -r $svn svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$date
+cd ffmpeg-$date
pushd libswscale
-svn update -r {$svn} libswscale
+svn update -r $svn libswscale
popd
./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
-tar jcf "$pwd"/ffmpeg-$svn.tar.bz2 ffmpeg-$svn
+tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-12/ffmpeg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ffmpeg.spec 7 Nov 2009 15:34:58 -0000 1.24
+++ ffmpeg.spec 26 Apr 2010 22:44:21 -0000 1.25
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20091026
+%global svn 20100425
%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.5
-Release: 5.%{svn}svn%{?dist}
+Version: 0.6
+Release: 0.1.%{svn}svn%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -16,10 +16,8 @@
URL: http://ffmpeg.org/
Source0: http://rpms.kwizart.net/fedora/SOURCES/%{name}-%{svn}.tar.bz2
Source1: ffmpeg-snapshot.sh
-# get rid of textrels on x86_64 in yasm code
-Patch0: %{name}-textrel.patch
-# compile with -fPIC on ppc/ppc64 (rf804)
-Patch1: %{name}-ppc-pic.patch
+# allow build with libx264.so.78
+Patch0: ffmpeg-x264.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -27,7 +25,6 @@
%{?_with_faac:BuildRequires: faac-devel}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: gsm-devel
-BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libtheora-devel
@@ -121,10 +118,14 @@
%prep
%setup -q -n %{name}-%{svn}
-%patch0 -p1 -b .textrel
-%patch1 -p1 -b .ppc-pic
+%patch0 -p1 -b .x264
+find ffpresets -type f -size 0 | xargs rm
%build
+%ifarch ppc ppc64
+# compile with -mlongcall on ppc/ppc64 (rf804)
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
+%endif
mkdir generic
pushd generic
%{ff_configure}\
@@ -198,9 +199,11 @@
%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
+%{_bindir}/ffprobe
%{_bindir}/ffserver
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
+%{_mandir}/man1/ffprobe.1*
%{_mandir}/man1/ffserver.1*
%{_datadir}/ffmpeg
@@ -227,6 +230,15 @@
%changelog
+* Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.1.20100425svn
+- 20100425 snapshot
+- drop upstream'd patch
+- bumped version to pre-0.6
+- added ffprobe to file list
+- dropped unnecessary imlib2-devel BR
+- patch to build with old x264 in F-12
+- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster
+
* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5-5.20091026svn
- Add -fPIC -dPIC when compiling on ppc (rf804)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Oct 2009 00:38:30 -0000 1.12
+++ sources 26 Apr 2010 22:44:21 -0000 1.13
@@ -1 +1 @@
-d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2
+760f683cfca2cd527bda41ca644c8d8d ffmpeg-20100425.tar.bz2
--- ffmpeg-ppc-pic.patch DELETED ---
--- ffmpeg-textrel.patch DELETED ---
14 years
rpms/xtables-addons-kmod/F-11 sources, 1.2, 1.3 xtables-addons-kmod.spec, 1.3, 1.4
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28842
Modified Files:
sources xtables-addons-kmod.spec
Log Message:
Update to 1.25
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:16:54 -0000 1.2
+++ sources 26 Apr 2010 15:46:28 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-11/xtables-addons-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtables-addons-kmod.spec 15 Apr 2010 07:07:06 -0000 1.3
+++ xtables-addons-kmod.spec 26 Apr 2010 15:46:28 -0000 1.4
@@ -3,13 +3,13 @@
# "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 newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 1.24
+Version: 1.25
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
@@ -17,8 +17,6 @@
Source0: http://downloads.sourceforge.net/xtables-addons/xtables-addons-%{version}...
Source11: xtables-addons-kmodtool-excludekernel-filterfile
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64 ppc ppc64 %{sparc} s390x s390 %{arm}
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -68,5 +66,11 @@
%changelog
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.1
+- rebuild for new kernel
+
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
14 years
rpms/xtables-addons-kmod/F-13 sources, 1.2, 1.3 xtables-addons-kmod.spec, 1.3, 1.4
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28814
Modified Files:
sources xtables-addons-kmod.spec
Log Message:
Update to 1.25
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:15:06 -0000 1.2
+++ sources 26 Apr 2010 15:46:23 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/xtables-addons-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtables-addons-kmod.spec 25 Apr 2010 07:18:50 -0000 1.3
+++ xtables-addons-kmod.spec 26 Apr 2010 15:46:23 -0000 1.4
@@ -3,14 +3,14 @@
# "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 newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 1.24
-Release: 1%{?dist}.1
+Version: 1.25
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
%changelog
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
+
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.1
- rebuild for new kernel
14 years
rpms/xtables-addons/F-13 sources, 1.2, 1.3 xtables-addons-userspace.patch, 1.1, 1.2 xtables-addons.spec, 1.2, 1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28681
Modified Files:
sources xtables-addons-userspace.patch xtables-addons.spec
Log Message:
Update to 1.25
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:08:19 -0000 1.2
+++ sources 26 Apr 2010 15:45:28 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
xtables-addons-userspace.patch:
Makefile.am | 1 -
configure.ac | 45 ---------------------------------------------
extensions/Makefile.am | 21 ---------------------
3 files changed, 67 deletions(-)
Index: xtables-addons-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons-userspace.patch 13 Apr 2010 01:08:19 -0000 1.1
+++ xtables-addons-userspace.patch 26 Apr 2010 15:45:28 -0000 1.2
@@ -1,5 +1,6 @@
---- _kmod_build_2.6.32.9-70.fc12.i686/configure.ac 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/configure.ac 2010-03-18 15:35:01.938461245 +0800
+diff -urP xtables-addons-1.25.org/configure.ac xtables-addons-1.25/configure.ac
+--- xtables-addons-1.25.org/configure.ac 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/configure.ac 2010-04-26 23:06:29.800752564 +0800
@@ -9,17 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -18,7 +19,7 @@
AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
-@@ -37,42 +26,9 @@
+@@ -37,42 +26,8 @@
-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-I\${XA_TOPSRCDIR}/include";
@@ -55,26 +56,16 @@
- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
- exit 1;
-fi;
-+
AC_SUBST([regular_CFLAGS])
-AC_SUBST([kbuilddir])
AC_SUBST([xtlibdir])
AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ACCOUNT/Makefile
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -urP xtables-addons-1.25.org/extensions/Makefile.am xtables-addons-1.25/extensions/Makefile.am
+--- xtables-addons-1.25.org/extensions/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/extensions/Makefile.am 2010-04-26 23:07:25.951752743 +0800
+@@ -1,26 +1,5 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -84,6 +75,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -99,3 +92,14 @@
-clean-local: clean_modules
include ../Makefile.extra
+diff -urP xtables-addons-1.25.org/Makefile.am xtables-addons-1.25/Makefile.am
+--- xtables-addons-1.25.org/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/Makefile.am 2010-04-26 23:07:43.614752996 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtables-addons.spec 25 Apr 2010 14:51:04 -0000 1.2
+++ xtables-addons.spec 26 Apr 2010 15:45:28 -0000 1.3
@@ -1,7 +1,7 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 1.24
-Release: 2%{?dist}
+Version: 1.25
+Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.c which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
@@ -105,6 +105,9 @@
%{_includedir}/*
%changelog
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
+
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
- rebuilt
14 years
rpms/xtables-addons/F-11 sources, 1.2, 1.3 xtables-addons-userspace.patch, 1.1, 1.2 xtables-addons.spec, 1.1, 1.2
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28644
Modified Files:
sources xtables-addons-userspace.patch xtables-addons.spec
Log Message:
Update to 1.25
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:12:17 -0000 1.2
+++ sources 26 Apr 2010 15:45:22 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
xtables-addons-userspace.patch:
Makefile.am | 1 -
configure.ac | 45 ---------------------------------------------
extensions/Makefile.am | 21 ---------------------
3 files changed, 67 deletions(-)
Index: xtables-addons-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-11/xtables-addons-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons-userspace.patch 13 Apr 2010 01:12:17 -0000 1.1
+++ xtables-addons-userspace.patch 26 Apr 2010 15:45:22 -0000 1.2
@@ -1,5 +1,6 @@
---- _kmod_build_2.6.32.9-70.fc12.i686/configure.ac 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/configure.ac 2010-03-18 15:35:01.938461245 +0800
+diff -urP xtables-addons-1.25.org/configure.ac xtables-addons-1.25/configure.ac
+--- xtables-addons-1.25.org/configure.ac 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/configure.ac 2010-04-26 23:06:29.800752564 +0800
@@ -9,17 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -18,7 +19,7 @@
AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
-@@ -37,42 +26,9 @@
+@@ -37,42 +26,8 @@
-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-I\${XA_TOPSRCDIR}/include";
@@ -55,26 +56,16 @@
- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
- exit 1;
-fi;
-+
AC_SUBST([regular_CFLAGS])
-AC_SUBST([kbuilddir])
AC_SUBST([xtlibdir])
AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ACCOUNT/Makefile
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -urP xtables-addons-1.25.org/extensions/Makefile.am xtables-addons-1.25/extensions/Makefile.am
+--- xtables-addons-1.25.org/extensions/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/extensions/Makefile.am 2010-04-26 23:07:25.951752743 +0800
+@@ -1,26 +1,5 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -84,6 +75,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -99,3 +92,14 @@
-clean-local: clean_modules
include ../Makefile.extra
+diff -urP xtables-addons-1.25.org/Makefile.am xtables-addons-1.25/Makefile.am
+--- xtables-addons-1.25.org/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/Makefile.am 2010-04-26 23:07:43.614752996 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-11/xtables-addons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons.spec 13 Apr 2010 01:12:17 -0000 1.1
+++ xtables-addons.spec 26 Apr 2010 15:45:22 -0000 1.2
@@ -1,6 +1,6 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 1.24
+Version: 1.25
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.c which is LGPLv2
License: GPLv2 and LGPLv2
@@ -105,5 +105,11 @@
%{_includedir}/*
%changelog
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
+- rebuilt
+
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
14 years
rpms/xtables-addons/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xtables-addons-userspace.patch, 1.1, 1.2 xtables-addons.spec, 1.1, 1.2
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27312
Modified Files:
.cvsignore sources xtables-addons-userspace.patch
xtables-addons.spec
Log Message:
Update to 1.25
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Apr 2010 01:10:36 -0000 1.2
+++ .cvsignore 26 Apr 2010 15:28:19 -0000 1.3
@@ -1 +1,2 @@
xtables-addons-1.24.tar.bz2
+xtables-addons-1.25.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:10:37 -0000 1.2
+++ sources 26 Apr 2010 15:28:19 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
xtables-addons-userspace.patch:
Makefile.am | 1 -
configure.ac | 45 ---------------------------------------------
extensions/Makefile.am | 21 ---------------------
3 files changed, 67 deletions(-)
Index: xtables-addons-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-12/xtables-addons-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons-userspace.patch 13 Apr 2010 01:10:37 -0000 1.1
+++ xtables-addons-userspace.patch 26 Apr 2010 15:28:19 -0000 1.2
@@ -1,5 +1,6 @@
---- _kmod_build_2.6.32.9-70.fc12.i686/configure.ac 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/configure.ac 2010-03-18 15:35:01.938461245 +0800
+diff -urP xtables-addons-1.25.org/configure.ac xtables-addons-1.25/configure.ac
+--- xtables-addons-1.25.org/configure.ac 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/configure.ac 2010-04-26 23:06:29.800752564 +0800
@@ -9,17 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -18,7 +19,7 @@
AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
-@@ -37,42 +26,9 @@
+@@ -37,42 +26,8 @@
-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-I\${XA_TOPSRCDIR}/include";
@@ -55,26 +56,16 @@
- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
- exit 1;
-fi;
-+
AC_SUBST([regular_CFLAGS])
-AC_SUBST([kbuilddir])
AC_SUBST([xtlibdir])
AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ACCOUNT/Makefile
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -urP xtables-addons-1.25.org/extensions/Makefile.am xtables-addons-1.25/extensions/Makefile.am
+--- xtables-addons-1.25.org/extensions/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/extensions/Makefile.am 2010-04-26 23:07:25.951752743 +0800
+@@ -1,26 +1,5 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -84,6 +75,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -99,3 +92,14 @@
-clean-local: clean_modules
include ../Makefile.extra
+diff -urP xtables-addons-1.25.org/Makefile.am xtables-addons-1.25/Makefile.am
+--- xtables-addons-1.25.org/Makefile.am 2010-04-26 20:12:03.000000000 +0800
++++ xtables-addons-1.25/Makefile.am 2010-04-26 23:07:43.614752996 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-12/xtables-addons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons.spec 13 Apr 2010 01:10:37 -0000 1.1
+++ xtables-addons.spec 26 Apr 2010 15:28:19 -0000 1.2
@@ -1,6 +1,6 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 1.24
+Version: 1.25
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.c which is LGPLv2
License: GPLv2 and LGPLv2
@@ -105,5 +105,11 @@
%{_includedir}/*
%changelog
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
+- rebuilt
+
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
14 years
rpms/xtables-addons-kmod/F-12 xtables-addons-kmod.spec,1.5,1.6
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27253
Modified Files:
xtables-addons-kmod.spec
Log Message:
Update to 1.25
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/xtables-addons-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xtables-addons-kmod.spec 22 Apr 2010 09:20:36 -0000 1.5
+++ xtables-addons-kmod.spec 26 Apr 2010 15:27:06 -0000 1.6
@@ -3,14 +3,14 @@
# "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 newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 1.24
-Release: 1%{?dist}.3
+Version: 1.25
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,13 +66,10 @@
%changelog
-* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.3
-- rebuild for new kernel
-
-* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.2
-- rebuild for new kernel
+* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
+- update to 1.25
-* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.1
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.1
- rebuild for new kernel
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
14 years
rpms/xtables-addons-kmod/F-12 .cvsignore,1.1,1.2 sources,1.2,1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26935
Modified Files:
.cvsignore sources
Log Message:
Update to 1.25
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Apr 2010 20:51:03 -0000 1.1
+++ .cvsignore 26 Apr 2010 15:25:40 -0000 1.2
@@ -0,0 +1 @@
+xtables-addons-1.25.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Apr 2010 01:16:47 -0000 1.2
+++ sources 26 Apr 2010 15:25:40 -0000 1.3
@@ -1 +1 @@
-1b538a25ef82edb7a7ea7411d599d6b9 xtables-addons-1.24.tar.bz2
+d2765d1e6be6194b2c24efa6684a6874 xtables-addons-1.25.tar.bz2
14 years
rpms/rpmfusion-nonfree-release/devel rpmfusion-nonfree-release.spec, 1.15, 1.16
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26138
Modified Files:
rpmfusion-nonfree-release.spec
Log Message:
* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2
- fix compatibility symlink
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-release.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmfusion-nonfree-release.spec 24 Apr 2010 18:09:42 -0000 1.15
+++ rpmfusion-nonfree-release.spec 26 Apr 2010 15:15:03 -0000 1.16
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 14
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -66,7 +66,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Links for the keys
for i in i386 x86_64 ppc ppc64; do
@@ -91,6 +91,9 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2
+- fix compatibility symlink
+
* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1
- rebuild for rawhide
14 years
rpms/rpmfusion-nonfree-release/F-13 rpmfusion-nonfree-release.spec, 1.15, 1.16
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26012
Modified Files:
rpmfusion-nonfree-release.spec
Log Message:
* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-2
- fix compatibility symlink
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-13/rpmfusion-nonfree-release.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmfusion-nonfree-release.spec 16 Apr 2010 17:39:55 -0000 1.15
+++ rpmfusion-nonfree-release.spec 26 Apr 2010 15:14:28 -0000 1.16
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 13
-Release: 1
+Release: 2
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -66,7 +66,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Links for the keys
for i in i386 x86_64 ppc ppc64; do
@@ -91,6 +91,9 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-2
+- fix compatibility symlink
+
* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1
- add key for Rawhide/F14
- remove key for F12
@@ -107,7 +110,6 @@
* Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1
- build for rawhide (enable rawhide, disable all the other repos)
-- mark config file as noreplace which was missing for some strange reason
* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1
- F11 release: disable rawhide, enable everything and updates
@@ -159,15 +161,19 @@
- s|basearch/debug/|basearch/os/debug/|" in *rawhide.repo
* Sun Sep 28 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-2
+- Fix rpmfusion-rpmfusion typo (again)
- update summary to properly say free or nonfree
* Sat Sep 27 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-1
- Update for Fedora 10 rawhide
- enable devel repos, disable all the others
-* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-6
+* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7
- Use temporary mirrorlists for now, and baseurl for the debug & source repos
+* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6
+- Fix rpmfusion-rpmfusion typo
+
* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5
- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist
- Use download.rpmfusion.org instead of download1.rpmfusion.org
14 years