rpms/nvidia-kmod/F-14 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 nvidia-kmod.spec, 1.82, 1.83
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26511
Modified Files:
.cvsignore sources nvidia-kmod.spec
Log Message:
Update to current
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 21 Jan 2011 19:34:45 -0000 1.26
+++ .cvsignore 8 Jun 2011 21:15:03 -0000 1.27
@@ -1 +1 @@
-nvidia-kmod-data-260.19.36.tar.bz2
+nvidia-kmod-data-270.41.19.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 21 Jan 2011 19:34:45 -0000 1.26
+++ sources 8 Jun 2011 21:15:03 -0000 1.27
@@ -1 +1 @@
-4c24281fd34f00259cc817f952347369 nvidia-kmod-data-260.19.36.tar.bz2
+6fe7e5cc53b7cef491eba978bcbb7c4d nvidia-kmod-data-270.41.19.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/nvidia-kmod.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- nvidia-kmod.spec 28 May 2011 05:39:30 -0000 1.82
+++ nvidia-kmod.spec 8 Jun 2011 21:15:03 -0000 1.83
@@ -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 newest
Name: nvidia-kmod
Epoch: 1
-Version: 260.19.36
+Version: 270.41.19
# Taken over by kmodtool
-Release: 1%{?dist}.5
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,6 +86,9 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+
* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.36-1.5
- rebuild for updated kernel
12 years, 11 months
rpms/nvidia-kmod/F-15 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 nvidia-kmod.spec, 1.81, 1.82
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26361
Modified Files:
.cvsignore sources nvidia-kmod.spec
Log Message:
Update to current
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 30 Apr 2011 22:35:48 -0000 1.30
+++ .cvsignore 8 Jun 2011 21:12:03 -0000 1.31
@@ -1 +1 @@
-nvidia-kmod-data-270.41.06.tar.bz2
+nvidia-kmod-data-270.41.19.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Apr 2011 22:35:48 -0000 1.30
+++ sources 8 Jun 2011 21:12:03 -0000 1.31
@@ -1 +1 @@
-d43cf8a037fb8167aebf8ff999a44bd0 nvidia-kmod-data-270.41.06.tar.bz2
+6fe7e5cc53b7cef491eba978bcbb7c4d nvidia-kmod-data-270.41.19.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- nvidia-kmod.spec 4 Jun 2011 06:08:29 -0000 1.81
+++ nvidia-kmod.spec 8 Jun 2011 21:12:03 -0000 1.82
@@ -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 newest
Name: nvidia-kmod
Epoch: 1
-Version: 270.41.06
+Version: 270.41.19
# Taken over by kmodtool
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,6 +86,9 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+
* Sat Jun 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:270.41.06-2.1
- rebuild for updated kernel
12 years, 11 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 xorg-x11-drv-nvidia.spec, 1.60, 1.61 filter-provides.sh, 1.1, NONE filter-requires.sh, 1.3, NONE nvidia-config-display, 1.4, NONE nvidia-init, 1.4, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25915
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Removed Files:
filter-provides.sh filter-requires.sh nvidia-config-display
nvidia-init
Log Message:
Update to current
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 30 Apr 2011 22:35:09 -0000 1.30
+++ .cvsignore 8 Jun 2011 21:09:17 -0000 1.31
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-270.41.06.run
-NVIDIA-Linux-x86_64-270.41.06.run
+NVIDIA-Linux-x86-270.41.19.run
+NVIDIA-Linux-x86_64-270.41.19.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Apr 2011 22:35:09 -0000 1.30
+++ sources 8 Jun 2011 21:09:17 -0000 1.31
@@ -1,2 +1,2 @@
-702868c77b13bba46f0fce26ed7a1fb7 NVIDIA-Linux-x86-270.41.06.run
-76d94f513731c75bdc4b763a3501cd4e NVIDIA-Linux-x86_64-270.41.06.run
+c167e32702f56599bd600add97943312 NVIDIA-Linux-x86-270.41.19.run
+b84143ecb5c0511c5ef9e53e732d9136 NVIDIA-Linux-x86_64-270.41.19.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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-nvidia.spec 30 Apr 2011 22:35:09 -0000 1.60
+++ xorg-x11-drv-nvidia.spec 8 Jun 2011 21:09:17 -0000 1.61
@@ -1,15 +1,12 @@
%global nvidialibdir %{_libdir}/nvidia
%global ignoreabi 0
-# Tweak to have debuginfo - part 1/2
-%if 0%{?fedora} >= 7
-%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-%{nil}
-%endif
+%global debug_package %{nil}
+%global __strip /bin/true
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 270.41.06
+Version: 270.41.19
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -20,18 +17,9 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
-#Source5: nvidia-init
Source6: blacklist-nouveau.conf
-#Source10: nvidia-config-display
Source11: nvidia-README.Fedora
-# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-# So we don't mess with mesa provides.
-Source92: filter-provides.sh
Source99: 00-ignoreabi.conf
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
-%define __find_provides %{SOURCE92}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -80,6 +68,20 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+%{?filter_setup:
+%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGL\.so/d;
+%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
+%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_from_provides /^libglx\.so/d;
+%filter_from_requires /^libnvidia/d;
+%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
+%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_setup
+}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -131,11 +133,6 @@
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
%ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg
@@ -143,12 +140,6 @@
ln -s nvidiapkg-x64 nvidiapkg
%endif
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
-
%build
# Nothing to build
echo "Nothing to build"
@@ -350,6 +341,10 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+- Use official filter macros - patch from <Jochen herr-schmitt de>
+
* Sat Apr 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.06-1
- Update to 270.41.06
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---
--- nvidia-config-display DELETED ---
--- nvidia-init DELETED ---
12 years, 11 months
rpms/xorg-x11-drv-nvidia/F-15 nvidia-README.Fedora, 1.5, 1.6 sources, 1.30, 1.31 .cvsignore, 1.30, 1.31 xorg-x11-drv-nvidia.spec, 1.60, 1.61 nvidia-config-display, 1.4, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25369
Modified Files:
sources .cvsignore xorg-x11-drv-nvidia.spec
Added Files:
nvidia-README.Fedora
Removed Files:
nvidia-config-display
Log Message:
Update to 270.41.19
Index: nvidia-README.Fedora
===================================================================
RCS file: nvidia-README.Fedora
diff -N nvidia-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-README.Fedora 8 Jun 2011 21:05:21 -0000 1.6
@@ -0,0 +1 @@
+See http://rpmfusion.org/Howto/nVidia
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Apr 2011 22:35:09 -0000 1.30
+++ sources 8 Jun 2011 21:05:21 -0000 1.31
@@ -1,2 +1,2 @@
-702868c77b13bba46f0fce26ed7a1fb7 NVIDIA-Linux-x86-270.41.06.run
-76d94f513731c75bdc4b763a3501cd4e NVIDIA-Linux-x86_64-270.41.06.run
+c167e32702f56599bd600add97943312 NVIDIA-Linux-x86-270.41.19.run
+b84143ecb5c0511c5ef9e53e732d9136 NVIDIA-Linux-x86_64-270.41.19.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 30 Apr 2011 22:35:09 -0000 1.30
+++ .cvsignore 8 Jun 2011 21:05:21 -0000 1.31
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-270.41.06.run
-NVIDIA-Linux-x86_64-270.41.06.run
+NVIDIA-Linux-x86-270.41.19.run
+NVIDIA-Linux-x86_64-270.41.19.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-nvidia.spec 30 Apr 2011 22:35:09 -0000 1.60
+++ xorg-x11-drv-nvidia.spec 8 Jun 2011 21:05:21 -0000 1.61
@@ -1,15 +1,12 @@
%global nvidialibdir %{_libdir}/nvidia
%global ignoreabi 0
-# Tweak to have debuginfo - part 1/2
-%if 0%{?fedora} >= 7
-%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-%{nil}
-%endif
+%global debug_package %{nil}
+%global __strip /bin/true
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 270.41.06
+Version: 270.41.19
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -20,18 +17,9 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
-#Source5: nvidia-init
Source6: blacklist-nouveau.conf
-#Source10: nvidia-config-display
Source11: nvidia-README.Fedora
-# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-# So we don't mess with mesa provides.
-Source92: filter-provides.sh
Source99: 00-ignoreabi.conf
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
-%define __find_provides %{SOURCE92}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -80,6 +68,20 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+%{?filter_setup:
+%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGL\.so/d;
+%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
+%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_from_provides /^libglx\.so/d;
+%filter_from_requires /^libnvidia/d;
+%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
+%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_setup
+}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -131,11 +133,6 @@
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
%ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg
@@ -143,12 +140,6 @@
ln -s nvidiapkg-x64 nvidiapkg
%endif
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
-
%build
# Nothing to build
echo "Nothing to build"
@@ -350,6 +341,10 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+- Use official filter macros - patch from <Jochen herr-schmitt de>
+
* Sat Apr 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.06-1
- Update to 270.41.06
--- nvidia-config-display DELETED ---
12 years, 11 months
rpms/xorg-x11-drv-nvidia/F-15 nvidia-README.Fedora,1.4,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25278
Removed Files:
nvidia-README.Fedora
Log Message:
cleaning
--- nvidia-README.Fedora DELETED ---
12 years, 11 months
rpms/nvidia-kmod/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 nvidia-kmod.spec, 1.75, 1.76
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24560
Modified Files:
.cvsignore sources nvidia-kmod.spec
Log Message:
Update to current
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 30 Apr 2011 22:35:48 -0000 1.30
+++ .cvsignore 8 Jun 2011 20:56:43 -0000 1.31
@@ -1 +1 @@
-nvidia-kmod-data-270.41.06.tar.bz2
+nvidia-kmod-data-270.41.19.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Apr 2011 22:35:48 -0000 1.30
+++ sources 8 Jun 2011 20:56:43 -0000 1.31
@@ -1 +1 @@
-d43cf8a037fb8167aebf8ff999a44bd0 nvidia-kmod-data-270.41.06.tar.bz2
+6fe7e5cc53b7cef491eba978bcbb7c4d nvidia-kmod-data-270.41.19.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- nvidia-kmod.spec 30 Apr 2011 22:35:48 -0000 1.75
+++ nvidia-kmod.spec 8 Jun 2011 20:56:43 -0000 1.76
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 270.41.06
+Version: 270.41.19
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -86,6 +86,9 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+
* Sat Apr 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.06-1
- Update to 270.41.06
12 years, 11 months
rpms/motion/F-15 .cvsignore, 1.4, 1.5 motion.spec, 1.7, 1.8 sources, 1.4, 1.5
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9441
Modified Files:
.cvsignore motion.spec sources
Log Message:
Update to 3.3.0 to fix problems with 2.6.38+ kernels
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1 Jun 2010 18:59:31 -0000 1.4
+++ .cvsignore 8 Jun 2011 17:54:53 -0000 1.5
@@ -1 +1 @@
-motion-3.2.12.tar.gz
+motion-3.3.0.tar.gz
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/motion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- motion.spec 1 Jun 2010 18:59:31 -0000 1.7
+++ motion.spec 8 Jun 2011 17:54:53 -0000 1.8
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.12
-Release: 1%{?dist}
+Version: 3.3.0
+Release: trunkREV528%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -45,7 +45,7 @@
sed -i 's|sql_log_timelapse|; sql_log_timelapse|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_query|; sql_query|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We set the log file and target directory - logging is for 3.3 branch
-#sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
install -D -m 0755 motion.init-Fedora %{buildroot}%{_initrddir}/%{name}
@@ -91,6 +91,9 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
+- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
+
* Thu Mar 06 2010 Steven Moix <steven.moix(a)axianet.ch> - 3.2.12-1
- New upstream release, important bugfixes only
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Jun 2010 18:59:31 -0000 1.4
+++ sources 8 Jun 2011 17:54:53 -0000 1.5
@@ -1 +1 @@
-1ba0065ed50509aaffb171594c689f46 motion-3.2.12.tar.gz
+c6abce3290a5ac255c241f8f27334b17 motion-3.3.0.tar.gz
12 years, 11 months
rpms/motion/devel .cvsignore, 1.4, 1.5 motion.spec, 1.7, 1.8 sources, 1.4, 1.5
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8878
Modified Files:
.cvsignore motion.spec sources
Log Message:
Update to 3.3.0 svn to fix problems with recent kernels
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1 Jun 2010 18:59:31 -0000 1.4
+++ .cvsignore 8 Jun 2011 17:50:53 -0000 1.5
@@ -1 +1 @@
-motion-3.2.12.tar.gz
+motion-3.3.0.tar.gz
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- motion.spec 1 Jun 2010 18:59:31 -0000 1.7
+++ motion.spec 8 Jun 2011 17:50:53 -0000 1.8
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.12
-Release: 1%{?dist}
+Version: 3.3.0
+Release: trunkREV528%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -45,7 +45,7 @@
sed -i 's|sql_log_timelapse|; sql_log_timelapse|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_query|; sql_query|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We set the log file and target directory - logging is for 3.3 branch
-#sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
install -D -m 0755 motion.init-Fedora %{buildroot}%{_initrddir}/%{name}
@@ -91,6 +91,9 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
+- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
+
* Thu Mar 06 2010 Steven Moix <steven.moix(a)axianet.ch> - 3.2.12-1
- New upstream release, important bugfixes only
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Jun 2010 18:59:31 -0000 1.4
+++ sources 8 Jun 2011 17:50:53 -0000 1.5
@@ -1 +1 @@
-1ba0065ed50509aaffb171594c689f46 motion-3.2.12.tar.gz
+c6abce3290a5ac255c241f8f27334b17 motion-3.3.0.tar.gz
12 years, 11 months
rpms/foo2zjs/F-13 .cvsignore, 1.6, 1.7 foo2zjs-dynamic-jbig.patch, 1.4, 1.5 foo2zjs.spec, 1.9, 1.10 sources, 1.7, 1.8
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6337/F-13
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
Update to 20110602 version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 3 Nov 2010 17:18:31 -0000 1.6
+++ .cvsignore 8 Jun 2011 17:21:51 -0000 1.7
@@ -1 +1 @@
-foo2zjs-20101016.tar.gz
+foo2zjs-20110602.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 93 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 44 insertions(+), 4052 deletions(-)
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- foo2zjs-dynamic-jbig.patch 3 Nov 2010 17:18:31 -0000 1.4
+++ foo2zjs-dynamic-jbig.patch 8 Jun 2011 17:21:53 -0000 1.5
@@ -1,5 +1,5 @@
-diff -uNr foo2zjs.original/jbig_ar.c foo2zjs/jbig_ar.c
---- foo2zjs.original/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs-patch1/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,426 +0,0 @@
-/*
@@ -428,8 +428,8 @@
-
- return pix;
-}
-diff -uNr foo2zjs.original/jbig_ar.h foo2zjs/jbig_ar.h
---- foo2zjs.original/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h
+--- foo2zjs-patch1/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-/*
@@ -487,8 +487,8 @@
-int arith_decode(struct jbg_ardec_state *s, int cx);
-
-#endif /* JBG_AR_H */
-diff -uNr foo2zjs.original/jbig.c foo2zjs/jbig.c
---- foo2zjs.original/jbig.c 2008-09-05 17:06:03.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c
+--- foo2zjs-patch1/jbig.c 2008-09-05 17:06:03.000000000 +0200
+++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,3289 +0,0 @@
-/*
@@ -3780,8 +3780,8 @@
- }
- return JBG_EINVAL | 0;
-}
-diff -uNr foo2zjs.original/jbig.h foo2zjs/jbig.h
---- foo2zjs.original/jbig.h 2008-09-05 17:06:03.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h
+--- foo2zjs-patch1/jbig.h 2008-09-05 17:06:03.000000000 +0200
+++ foo2zjs/jbig.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,233 +0,0 @@
-/*
@@ -4017,9 +4017,9 @@
-int jbg_newlen(unsigned char *bie, size_t len);
-
-#endif /* JBG_H */
-diff -uNr foo2zjs.original/Makefile foo2zjs/Makefile
---- foo2zjs.original/Makefile 2010-08-17 17:14:59.000000000 +0200
-+++ foo2zjs/Makefile 2010-09-15 18:53:19.666288601 +0200
+diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile
+--- foo2zjs-patch1/Makefile 2011-06-03 23:05:12.000000000 +0200
++++ foo2zjs/Makefile 2011-06-07 23:13:42.242002026 +0200
@@ -19,7 +19,6 @@
# Installation prefix...
PREFIX=/usr/local
@@ -4048,8 +4048,8 @@
zjsdecode.c \
zjsdecode.1in \
zjs.h \
-@@ -266,7 +261,7 @@
- MANPAGES+= gipddecode.1
+@@ -273,7 +268,7 @@
+ MANPAGES+= hbpldecode.1
MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
MANPAGES+= printer-profile.1
-LIBJBG = jbig.o jbig_ar.o
@@ -4057,94 +4057,98 @@
BINPROGS=
ifeq ($(UNAME),Linux)
-@@ -403,29 +398,29 @@
+@@ -420,29 +415,29 @@
@echo "yourself."
-foo2zjs: foo2zjs.o $(LIBJBG)
-+foo2zjs: foo2zjs.o
++foo2zjs: foo2zjs.o
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
-foo2hp: foo2hp.o $(LIBJBG)
-+foo2hp: foo2hp.o
++foo2hp: foo2hp.o
# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
-foo2xqx: foo2xqx.o $(LIBJBG)
-+foo2xqx: foo2xqx.o
++foo2xqx: foo2xqx.o
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
-foo2lava: foo2lava.o $(LIBJBG)
-+foo2lava: foo2lava.o
++foo2lava: foo2lava.o
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
-foo2qpdl: foo2qpdl.o $(LIBJBG)
-+foo2qpdl: foo2qpdl.o
++foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
-foo2oak: foo2oak.o $(LIBJBG)
-+foo2oak: foo2oak.o
++foo2oak: foo2oak.o
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
-foo2slx: foo2slx.o $(LIBJBG)
-+foo2slx: foo2slx.o
++foo2slx: foo2slx.o
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
-foo2hiperc: foo2hiperc.o $(LIBJBG)
-+foo2hiperc: foo2hiperc.o
++foo2hiperc: foo2hiperc.o
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
-@@ -488,37 +483,37 @@
- all-icc2ps:
- cd icc2ps; $(MAKE) all
+@@ -510,40 +505,40 @@
+ cd osx-hotplug; $(MAKE) all
+ endif
-ok: ok.o $(LIBJBG)
-+ok: ok.o
++ok: ok.o
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
--zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
- $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
+-gipddecode: gipddecode.o $(LIBJBG)
++gipddecode: gipddecode.o
+ $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+
+-hbpldecode: hbpldecode.o $(LIBJBG)
++hbpldecode: hbpldecode.o
+ $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
-hipercdecode: hipercdecode.o $(LIBJBG)
-+hipercdecode: hipercdecode.o
++hipercdecode: hipercdecode.o
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
--splcdecode: splcdecode.o $(LIBJBG)
-+splcdecode: splcdecode.o
- $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-
--xqxdecode: xqxdecode.o $(LIBJBG)
-+xqxdecode: xqxdecode.o
- $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
-
-lavadecode: lavadecode.o $(LIBJBG)
-+lavadecode: lavadecode.o
++lavadecode: lavadecode.o
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
--qpdldecode: qpdldecode.o $(LIBJBG)
-+qpdldecode: qpdldecode.o
- $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
+-oakdecode: oakdecode.o $(LIBJBG)
++oakdecode: oakdecode.o
+ $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
-opldecode: opldecode.o $(LIBJBG)
-+opldecode: opldecode.o
++opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
--oakdecode: oakdecode.o $(LIBJBG)
-+oakdecode: oakdecode.o
- $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
+-qpdldecode: qpdldecode.o $(LIBJBG)
++qpdldecode: qpdldecode.o
+ $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
+
+-splcdecode: splcdecode.o $(LIBJBG)
++splcdecode: splcdecode.o
+ $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-slxdecode: slxdecode.o $(LIBJBG)
-+slxdecode: slxdecode.o
++slxdecode: slxdecode.o
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
--gipddecode: gipddecode.o $(LIBJBG)
-+gipddecode: gipddecode.o
- $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+-xqxdecode: xqxdecode.o $(LIBJBG)
++xqxdecode: xqxdecode.o
+ $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
+
+-zjsdecode: zjsdecode.o $(LIBJBG)
++zjsdecode: zjsdecode.o
+ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
-@@ -797,9 +792,9 @@
+@@ -834,9 +829,9 @@
done; \
fi
@@ -4157,7 +4161,7 @@
install-desktop:
#
-@@ -987,7 +982,7 @@
+@@ -1051,7 +1046,7 @@
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
-rm -f *.zc *.zm
-rm -f xxx.* xxxomatic
@@ -4166,7 +4170,7 @@
-rm -f foo2oak.o oakdecode.o
-rm -f foo2xqx.o xqxdecode.o
-rm -f foo2lava.o lavadecode.o
-@@ -1013,23 +1008,23 @@
+@@ -1078,24 +1073,24 @@
#
# Header dependencies
#
@@ -4181,29 +4185,31 @@
-foo2slx.o: slx.h jbig.h
-foo2hiperc.o: jbig.h hiperc.h
-hipercdecode.o: hiperc.h jbig.h
+-hbpldecode.o: jbig.h
-lavadecode.o: jbig.h
-qpdldecode.o: jbig.h
-opldecode.o: jbig.h
-slxdecode.o: slx.h jbig.h
-xqxdecode.o: xqx.h jbig.h
-gipddecode.o: slx.h jbig.h
-+zjsdecode.o: zjs.h
-+foo2zjs.o: zjs.h
-+foo2oak.o: oak.h
++zjsdecode.o: zjs.h
++foo2zjs.o: zjs.h
++foo2oak.o: oak.h
+jbig.o:
+foo2hp.o: zjs.h cups.h
-+foo2xqx.o: xqx.h
-+foo2lava.o:
++foo2xqx.o: xqx.h
++foo2lava.o:
+foo2qpdl.o: qpdl.h
-+foo2slx.o: slx.h
++foo2slx.o: slx.h
+foo2hiperc.o: hiperc.h
-+hipercdecode.o: hiperc.h
-+lavadecode.o:
-+qpdldecode.o:
-+opldecode.o:
-+slxdecode.o: slx.h
-+xqxdecode.o: xqx.h
-+gipddecode.o: slx.h
++hipercdecode.o: hiperc.h
++hbpldecode.o:
++lavadecode.o:
++qpdldecode.o:
++opldecode.o:
++slxdecode.o: slx.h
++xqxdecode.o: xqx.h
++gipddecode.o: slx.h
#
# foo2* Regression tests
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- foo2zjs.spec 3 Nov 2010 17:18:31 -0000 1.9
+++ foo2zjs.spec 8 Jun 2011 17:21:54 -0000 1.10
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20101016
+%define foo2zjs_ver 20110602
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -14,6 +14,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
+BuildRequires: bc
Requires: lcms
Requires: argyllcms
Requires(post): /bin/rm
@@ -242,6 +243,7 @@
%{_datadir}/foomatic/db/source/driver/foo2zjs.xml
%{_datadir}/foomatic/db/source/driver/foo2zjs-z1.xml
%{_datadir}/foomatic/db/source/driver/foo2zjs-z2.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z3.xml
%{_datadir}/foomatic/db/source/opt/foo2zjs*.xml
%{_datadir}/foomatic/db/source/opt/foo2xxx*.xml
%{_datadir}/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@@ -250,12 +252,14 @@
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
+%{_datadir}/foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
%{_datadir}/cups/model/Generic-ZjStream_Printer.ppd.gz
%{_datadir}/cups/model/HP-LaserJet_1*.ppd.gz
%{_datadir}/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2200_DL.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2300_DL.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2430_DL.ppd.gz
+%{_datadir}/cups/model/Olivetti-d-Color_P160W.ppd.gz
%files -n foo2hp
%defattr(-,root,root,-)
@@ -310,7 +314,9 @@
%files -n foo2qpdl
%defattr(-,root,root,-)
%{_bindir}/*qpdl*
+%{_bindir}/hbpldecode
%{_mandir}/man1/*qpdl*
+%{_mandir}/man1/hbpldecode*
%{_datadir}/foomatic/db/source/driver/foo2qpdl.xml
%{_datadir}/foomatic/db/source/opt/foo2qpdl*.xml
%{_datadir}/foomatic/db/source/printer/Samsung-CL*.xml
@@ -381,6 +387,16 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Thu Jun 7 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20110602-1
+- New program: hbpldecode for decoding Fuji-Zerox cp105b and Dell 1250c
+
+* Sun Feb 13 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20110210-1
+- Update to last release
+- New Printer: Olivetti d-Color P160W
+- New Printer: HP LaserJet Pro CP1025nw
+- New printers: HP LaserJet 1022n, HP LaserJet 1022nw
+- New Printer: Oki C310dn
+
* Sat Oct 23 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20101016-1
- Update to last release
- Remove Samsung-CLP-310.xml which conflict with foomatic-db package
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 3 Nov 2010 17:18:32 -0000 1.7
+++ sources 8 Jun 2011 17:21:54 -0000 1.8
@@ -1 +1 @@
-00907246dab06daa16a4cab29c4d6ddd foo2zjs-20101016.tar.gz
+cc9036f77bf3eff973207d7325fee192 foo2zjs-20110602.tar.gz
12 years, 11 months