rpms/wl-kmod/F-17 wl-kmod.spec,1.75,1.76
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24472
Modified Files:
wl-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.3
- spec file cleanup
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wl-kmod.spec 21 Jun 2012 08:07:34 -0000 1.75
+++ wl-kmod.spec 23 Jun 2012 16:51:32 -0000 1.76
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 3%{?dist}.2
+Release: 3%{?dist}.3
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -73,18 +73,21 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}
- mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
- install -m 755 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+ mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}${kernel_version%%___*}%{kmodinstdir_postfix}
+ install -m 0755 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}${kernel_version%%___*}%{kmodinstdir_postfix}
popd
done
-chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/*/* || :
+chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 23 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.3
+- spec file cleanup
+
* Thu Jun 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-3.2
- Rebuilt for updated kernel
11 years, 11 months
rpms/x264/devel x264.spec,1.38,1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19329/devel
Modified Files:
x264.spec
Log Message:
- Rework alternatives build
- Fix SONAME for x26410b
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- x264.spec 17 Jun 2012 03:11:09 -0000 1.38
+++ x264.spec 23 Jun 2012 15:13:35 -0000 1.39
@@ -6,6 +6,7 @@
%{?_with_bootstrap:
%global _without_gpac 1
%global _without_libavformat 1
+%global _without_libswscale 1
}
#Whitelist of arches with dedicated ASM code
%ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc}
@@ -19,7 +20,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.124
-Release: 2.%{snapshot}%{?dist}
+Release: 3.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -69,6 +70,7 @@
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
%{?_without_libavformat:--disable-lavf} \\\
+ %{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
%{?_without_asm:--disable-asm} \\\
--enable-debug \\\
@@ -78,16 +80,22 @@
%prep
-%setup -q -n %{name}-%{branch}-%{snapshot}
+%setup -q -c -n %{name}-%{branch}-%{snapshot}
+pushd %{name}-%{branch}-%{snapshot}
%patch0 -p1 -b .nover
+popd
+variants="generic generic10"
%ifarch i686
-mkdir simd
-cp -a `ls -1|grep -v simd` simd/
+variants="$variants simd"
%endif
-cd ..
-cp -a %{name}-%{branch}-%{snapshot} %{name}-%{branch}-%{snapshot}10b
+for variant in $variants ; do
+ rm -rf ${variant}
+ cp -pr %{name}-%{branch}-%{snapshot} ${variant}
+done
+
%build
+pushd generic
%{x_configure}\
--host=%{_target_platform} \
--libdir=%{_libdir} \
@@ -96,6 +104,8 @@
%endif
%{__make} %{?_smp_mflags}
+popd
+
%ifarch i686
pushd simd
%{x_configure}\
@@ -105,32 +115,39 @@
%{__make} %{?_smp_mflags}
popd
%endif
-cd ../%{name}-%{branch}-%{snapshot}10b
+
+pushd generic10
%{x_configure}\
--host=%{_target_platform} \
--libdir=%{_libdir} \
- --bit-depth=10 \
+ --bit-depth=10
%ifarch i686 armv5tel armv6l
--disable-asm \
%endif
+sed -i -e "s/SONAME=libx264.so./SONAME=libx26410b.so./" config.mak
%{__make} %{?_smp_mflags}
+popd
%install
+pushd generic
%{__make} DESTDIR=%{buildroot} install
+popd
%ifarch i686
pushd simd
%{__make} DESTDIR=%{buildroot} install
rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc
popd
%endif
-cd ../%{name}-%{branch}-%{snapshot}10b
-#{__make} DESTDIR=%{buildroot} install
-ln -f -s libx264.so.124 %{buildroot}%{_libdir}/libx26410b.so
-install -m 755 libx264.so.124 %{buildroot}%{_libdir}/libx26410b.so.124
+pushd generic10
+SONAME=`grep "^SONAME=" config.mak`
+export $SONAME
+install -m 755 ${SONAME} %{buildroot}%{_libdir}
+ln -fs ${SONAME} %{buildroot}%{_libdir}/libx26410b.so
+popd
#Fix timestamp on x264 generated headers
-touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
+touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
%post libs -p /sbin/ldconfig
@@ -139,7 +156,7 @@
%files
%defattr(644, root, root, 0755)
-%doc AUTHORS COPYING
+%doc generic/AUTHORS generic/COPYING
%attr(755,root,root) %{_bindir}/x264
%files libs
@@ -152,7 +169,7 @@
%files devel
%defattr(644, root, root, 0755)
-%doc doc/*
+%doc generic/doc/*
%{_includedir}/x264.h
%{_includedir}/x264_config.h
%{_libdir}/libx264.so
@@ -163,6 +180,10 @@
%{_libdir}/libx26410b.so
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.124-3.20120616
+- Rework alternatives build
+- Fix SONAME for x26410b
+
* Sun Jun 17 2012 Sérgio Basto <sergio(a)serjux.com> - 0.124-2.20120616
- use _libdir to fix build on x86_64.
11 years, 11 months
rpms/xine-lib-extras-freeworld/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xine-lib-extras-freeworld.spec, 1.44, 1.45
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30722/devel
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Log Message:
* Sat Jun 23 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-1
- update to 1.1.21 (bugfix release, matches Fedora xine-lib)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 3 Jan 2012 15:38:39 -0000 1.13
+++ .cvsignore 23 Jun 2012 10:07:28 -0000 1.14
@@ -1 +1 @@
-xine-lib-1.1.20.1.tar.xz
+xine-lib-1.1.21.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 3 Jan 2012 15:38:39 -0000 1.13
+++ sources 23 Jun 2012 10:07:28 -0000 1.14
@@ -1 +1 @@
-90f619084c692b4aff20c8f9d1259148 xine-lib-1.1.20.1.tar.xz
+d0163d4f9d7613fb050c5c2205973336 xine-lib-1.1.21.tar.xz
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xine-lib-extras-freeworld.spec 9 Mar 2012 09:19:33 -0000 1.44
+++ xine-lib-extras-freeworld.spec 23 Jun 2012 10:07:28 -0000 1.45
@@ -3,8 +3,8 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.20.1
-Release: 2%{?dist}
+Version: 1.1.21
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -177,6 +177,9 @@
%changelog
+* Sat Jun 23 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-1
+- update to 1.1.21 (bugfix release, matches Fedora xine-lib)
+
* Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.20.1-2
- Rebuilt
11 years, 11 months
rpms/wl-kmod/F-15 wl-kmod.spec,1.96,1.97
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28788
Modified Files:
wl-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.1
- Rebuilt for updated kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- wl-kmod.spec 13 Jun 2012 07:46:56 -0000 1.96
+++ wl-kmod.spec 23 Jun 2012 09:31:46 -0000 1.97
@@ -3,11 +3,11 @@
# "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: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -85,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.1
+- Rebuilt for updated kernel
+
* Wed Jun 13 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Added patch to build for kernel >= 3.4
11 years, 11 months
rpms/nvidia-kmod/F-15 nvidia-kmod.spec,1.130,1.131
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28649
Modified Files:
nvidia-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.59-1.1
- Rebuilt for updated kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- nvidia-kmod.spec 11 Jun 2012 18:33:39 -0000 1.130
+++ nvidia-kmod.spec 23 Jun 2012 09:31:32 -0000 1.131
@@ -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 current
+%define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
Version: 295.59
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.59-1.1
+- Rebuilt for updated kernel
+
* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
- Update to 295.59
11 years, 11 months
rpms/nvidia-173xx-kmod/F-15 nvidia-173xx-kmod.spec,1.76,1.77
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28478
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.31-2.8
- Rebuilt for updated kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-15/nvidia-173xx-kmod.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- nvidia-173xx-kmod.spec 5 Jun 2012 20:40:31 -0000 1.76
+++ nvidia-173xx-kmod.spec 23 Jun 2012 09:30:50 -0000 1.77
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.31
# Taken over by kmodtool
-Release: 2%{?dist}.7
+Release: 2%{?dist}.8
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -95,6 +95,9 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.31-2.8
+- Rebuilt for updated kernel
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.31-2.7
- Rebuilt for updated kernel
11 years, 11 months
rpms/catalyst-kmod/F-15 catalyst-kmod.spec,1.51,1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/catalyst-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28337
Modified Files:
catalyst-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-2.8
- Rebuilt for updated kernel
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/catalyst-kmod.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- catalyst-kmod.spec 5 Jun 2012 20:40:20 -0000 1.51
+++ catalyst-kmod.spec 23 Jun 2012 09:30:36 -0000 1.52
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 11.11
-Release: 2%{?dist}.7
+Release: 2%{?dist}.8
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-2.8
+- Rebuilt for updated kernel
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-2.7
- Rebuilt for updated kernel
11 years, 11 months
rpms/xtables-addons-kmod/F-15 xtables-addons-kmod.spec,1.52,1.53
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28206
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.19
- Rebuilt for updated kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-15/xtables-addons-kmod.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xtables-addons-kmod.spec 5 Jun 2012 20:40:12 -0000 1.52
+++ xtables-addons-kmod.spec 23 Jun 2012 09:30:27 -0000 1.53
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.41
-Release: 1%{?dist}.18
+Release: 1%{?dist}.19
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.19
+- Rebuilt for updated kernel
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.41-1.18
- Rebuilt for updated kernel
11 years, 11 months
rpms/west-chamber-kmod/F-15 west-chamber-kmod.spec,1.44,1.45
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28067
Modified Files:
west-chamber-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-6.20101017svn.39
- Rebuilt for updated kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-15/west-chamber-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- west-chamber-kmod.spec 5 Jun 2012 20:40:03 -0000 1.44
+++ west-chamber-kmod.spec 23 Jun 2012 09:30:15 -0000 1.45
@@ -13,7 +13,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 6.%{?svndate}svn%{?dist}.38
+Release: 6.%{?svndate}svn%{?dist}.39
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -84,6 +84,9 @@
rm -rf %{buildroot}
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-6.20101017svn.39
+- Rebuilt for updated kernel
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-6.20101017svn.38
- Rebuilt for updated kernel
11 years, 11 months
rpms/VirtualBox-OSE-kmod/F-15 VirtualBox-OSE-kmod.spec,1.99,1.100
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27933
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.14-2.3
- Rebuilt for updated kernel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-15/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- VirtualBox-OSE-kmod.spec 5 Jun 2012 20:39:52 -0000 1.99
+++ VirtualBox-OSE-kmod.spec 23 Jun 2012 09:30:03 -0000 1.100
@@ -18,7 +18,7 @@
Name: VirtualBox-OSE-kmod
Version: 4.1.14
-Release: 2%{?dist}.2
+Release: 2%{?dist}.3
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -96,6 +96,9 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.14-2.3
+- Rebuilt for updated kernel
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.14-2.2
- Rebuilt for updated kernel
11 years, 11 months