January 2013 - rpmfusion-commits

rpms/nvidia-96xx-kmod/F-17 nvidia-96xx-kmod.spec,1.54,1.55

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26266 Modified Files: nvidia-96xx-kmod.spec Log Message: * Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 96.43.23-2 - patch for 3.7 kernel Index: nvidia-96xx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17/nvidia-96xx-kmod.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- nvidia-96xx-kmod.spec 17 Jan 2013 09:27:52 -0000 1.54 +++ nvidia-96xx-kmod.spec 19 Jan 2013 22:55:13 -0000 1.55 @@ -7,7 +7,7 @@ Name: nvidia-96xx-kmod Version: 96.43.23 -Release: 1%{?dist}.19 +Release: 2%{?dist} # Taken over by kmodtool Summary: NVIDIA 96xx display driver kernel module Group: System Environment/Kernel @@ -21,6 +21,7 @@ Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2 #Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers... # </switch me> +Patch0: 3.7_kernel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,12 +45,12 @@ %setup -q -c -T -a 0 # patch loop -#for arch in x86 x64 -#do -# pushd nvidiapkg-${arch} -# empty -# popd -#done +for arch in x86 x64 +do + pushd nvidiapkg-${arch} +%patch0 -p1 + popd +done for kernel_version in %{?kernel_versions} ; do @@ -91,6 +92,9 @@ %changelog +* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 96.43.23-2 +- patch for 3.7 kernel + * Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-1.19 - Rebuilt for updated kernel

11 years, 10 months

1
0
0 / 0

rpms/catalyst-legacy-kmod/F-17 catalyst-legacy-kmod.spec,1.10,1.11

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25962 Modified Files: catalyst-legacy-kmod.spec Log Message: * Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2.7 - patch for 3.7 kernel Index: catalyst-legacy-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17/catalyst-legacy-kmod.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- catalyst-legacy-kmod.spec 19 Jan 2013 22:43:09 -0000 1.10 +++ catalyst-legacy-kmod.spec 19 Jan 2013 22:47:14 -0000 1.11 @@ -101,7 +101,7 @@ %changelog -* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2.7 +* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2 - patch for 3.7 kernel * Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.7

11 years, 10 months

1
0
0 / 0

rpms/catalyst-legacy-kmod/F-17 3.7_kernel.patch, NONE, 1.1 catalyst-legacy-kmod.spec, 1.9, 1.10

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25768 Modified Files: catalyst-legacy-kmod.spec Added Files: 3.7_kernel.patch Log Message: * Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2.7 - patch for 3.7 kernel 3.7_kernel.patch: firegl_public.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) --- NEW FILE 3.7_kernel.patch --- --- lib/modules/fglrx/build_mod/firegl_public.c +++ lib/modules/fglrx/build_mod/firegl_public.c @@ -3892,7 +3892,11 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_ops; break; @@ -3922,14 +3926,22 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_ops; } break; #endif case __KE_SHM: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_shm_ops; break; @@ -3937,7 +3949,11 @@ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ @@ -3946,14 +3962,22 @@ case __KE_CTX: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_ctx_ops; break; case __KE_PCI_BQS: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_pci_bq_ops; break; @@ -3984,9 +4008,17 @@ return -EAGAIN; } #ifdef __x86_64__ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ #endif vma->vm_ops = &vm_ops; } @@ -4015,9 +4047,17 @@ return -EAGAIN; } #ifdef __x86_64__ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ #endif vma->vm_ops = &vm_agp_bq_ops; } @@ -4025,7 +4065,11 @@ #endif /* __AGP__BUILTIN__ */ case __KE_KMAP: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_kmap_ops; if (readonly && (vma->vm_flags & VM_WRITE)) { @@ -4046,7 +4090,11 @@ #endif // fall through case __KE_GART_CACHEABLE: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_gart_ops; break; default: Index: catalyst-legacy-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-legacy-kmod/F-17/catalyst-legacy-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- catalyst-legacy-kmod.spec 17 Jan 2013 09:27:33 -0000 1.9 +++ catalyst-legacy-kmod.spec 19 Jan 2013 22:43:09 -0000 1.10 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +%define buildforkernels current # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -13,7 +13,7 @@ Name: catalyst-legacy-kmod Version: 12.6 -Release: 1%{?dist}.7 +Release: 2%{?dist} # Taken over by kmodtool Summary: AMD display legacy driver kernel module Group: System Environment/Kernel @@ -23,6 +23,7 @@ Source11: catalyst-kmodtool-excludekernel-filterfile Patch0: compat_alloc-Makefile.patch Patch1: 3.5-do_mmap.patch +Patch2: 3.7_kernel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i686 @@ -69,6 +70,7 @@ pushd fglrxpkg %patch0 -p0 -b.compat_alloc %patch1 -p0 -b.3.5-do_mmap +%patch2 -p0 -b.3.7_kernel popd for kernel_version in %{?kernel_versions} ; do @@ -99,6 +101,9 @@ %changelog +* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2.7 +- patch for 3.7 kernel + * Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.6-1.7 - Rebuilt for updated kernel

11 years, 10 months

1
0
0 / 0

rpms/catalyst-kmod/F-17 3.7_kernel.patch, NONE, 1.1 catalyst-kmod.spec, 1.64, 1.65

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25534 Modified Files: catalyst-kmod.spec Added Files: 3.7_kernel.patch Log Message: * Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-3 - pacth for 3.7 kernel 3.7_kernel.patch: firegl_public.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) --- NEW FILE 3.7_kernel.patch --- --- lib/modules/fglrx/build_mod/firegl_public.c +++ lib/modules/fglrx/build_mod/firegl_public.c @@ -3892,7 +3892,11 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_ops; break; @@ -3922,14 +3926,22 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_ops; } break; #endif case __KE_SHM: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_shm_ops; break; @@ -3937,7 +3949,11 @@ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ @@ -3946,14 +3962,22 @@ case __KE_CTX: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_ctx_ops; break; case __KE_PCI_BQS: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_pci_bq_ops; break; @@ -3984,9 +4008,17 @@ return -EAGAIN; } #ifdef __x86_64__ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ #endif vma->vm_ops = &vm_ops; } @@ -4015,9 +4047,17 @@ return -EAGAIN; } #ifdef __x86_64__ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ #endif vma->vm_ops = &vm_agp_bq_ops; } @@ -4025,7 +4065,11 @@ #endif /* __AGP__BUILTIN__ */ case __KE_KMAP: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_SHM | VM_RESERVED; +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_kmap_ops; if (readonly && (vma->vm_flags & VM_WRITE)) { @@ -4046,7 +4090,11 @@ #endif // fall through case __KE_GART_CACHEABLE: +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ vma->vm_ops = &vm_gart_ops; break; default: Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-17/catalyst-kmod.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- catalyst-kmod.spec 17 Jan 2013 09:27:24 -0000 1.64 +++ catalyst-kmod.spec 19 Jan 2013 22:37:26 -0000 1.65 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +%define buildforkernels current # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -13,7 +13,7 @@ Name: catalyst-kmod Version: 12.10 -Release: 2%{?dist}.12 +Release: 3%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -22,6 +22,7 @@ Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve... Source11: catalyst-kmodtool-excludekernel-filterfile Patch0: compat_alloc-Makefile.patch +Patch1: 3.7_kernel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i686 @@ -67,6 +68,7 @@ pushd fglrxpkg %patch0 -p0 -b.compat_alloc +%patch1 -p0 -b.3.7_kernel popd for kernel_version in %{?kernel_versions} ; do @@ -97,6 +99,9 @@ %changelog +* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-3 +- pacth for 3.7 kernel + * Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.10-2.12 - Rebuilt for updated kernel

11 years, 10 months

1
0
0 / 0

rpms/rpmfusion-nonfree-release/F-18 rpmfusion-nonfree-release.spec, 1.34, 1.35

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25403/F-18 Modified Files: rpmfusion-nonfree-release.spec Log Message: Fix for upgrade Index: rpmfusion-nonfree-release.spec =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-18/rpmfusion-nonfree-release.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- rpmfusion-nonfree-release.spec 3 Jan 2013 22:01:23 -0000 1.34 +++ rpmfusion-nonfree-release.spec 19 Jan 2013 22:36:09 -0000 1.35 @@ -3,7 +3,7 @@ Name: rpmfusion-%{repo}-release Version: 18 -Release: 2 +Release: 3 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -76,6 +76,13 @@ ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide +# Compatibility Links for the keys for F-17 > Later update. +# Can be dropped by F-20 +for i in i386 x86_64 arm armhfp ; do + ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i} + ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i} +done + # Yum .repo files %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ @@ -91,6 +98,9 @@ %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 18-3 +- Add Arch links on GPG keys for upgrade + * Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 18-2 - Fix namespace of the gpg key

11 years, 10 months

1
0
0 / 0

rpms/rpmfusion-free-release/F-18 rpmfusion-free-release.spec, 1.39, 1.40

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/rpmfusion-free-release/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25270/F-18 Modified Files: rpmfusion-free-release.spec Log Message: Fix for upgrades Index: rpmfusion-free-release.spec =================================================================== RCS file: /cvs/free/rpms/rpmfusion-free-release/F-18/rpmfusion-free-release.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- rpmfusion-free-release.spec 3 Jan 2013 21:47:48 -0000 1.39 +++ rpmfusion-free-release.spec 19 Jan 2013 22:34:36 -0000 1.40 @@ -3,7 +3,7 @@ Name: rpmfusion-%{repo}-release Version: 18 -Release: 2 +Release: 3 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -76,6 +76,13 @@ ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide +# Compatibility Links for the keys for F-17 > Later update. +# Can be dropped by F-20 +for i in i386 x86_64 arm armhfp ; do + ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i} + ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i} +done + # Yum .repo files %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ @@ -91,6 +98,9 @@ %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 18-3 +- Add Arch links on GPG keys for upgrade + * Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 18-2 - Fix namespace of the gpg key

11 years, 10 months

1
0
0 / 0

rpms/x264/devel .cvsignore,1.25,1.26 sources,1.25,1.26

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/x264/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9127 Modified Files: .cvsignore sources Log Message: forgot upload sources ... Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 19 Nov 2012 01:57:35 -0000 1.25 +++ .cvsignore 19 Jan 2013 11:29:01 -0000 1.26 @@ -1 +1 @@ -x264-stable-20121118-f6a8615.tar.bz2 +x264-0.129-20130119-9c4ba4b.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 19 Nov 2012 01:57:35 -0000 1.25 +++ sources 19 Jan 2013 11:29:01 -0000 1.26 @@ -1 +1 @@ -17211481fbf0873ad8ad7e44c08296a6 x264-stable-20121118-f6a8615.tar.bz2 +7689ba9e15f75f12e018b109297c80fc x264-0.129-20130119-9c4ba4b.tar.bz2

11 years, 10 months

1
0
0 / 0

rpms/x264/devel x264-snapshot.sh,1.5,1.6 x264.spec,1.50,1.51

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/x264/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8908 Modified Files: x264-snapshot.sh x264.spec Log Message: * Sat Jan 19 2013 Sérgio Basto <sergio(a)serjux.com> - 0.129-1.20130119git9c4ba4b - Update to 9c4ba4bde8965571159eae2d79f85cabbb47416c, soname bump. - Changed branch name by api number, is more readable. - Drop upstreamed patch. Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- x264-snapshot.sh 6 Oct 2012 00:04:51 -0000 1.5 +++ x264-snapshot.sh 19 Jan 2013 11:26:02 -0000 1.6 @@ -24,7 +24,8 @@ git checkout ${commit} git checkout -b rpmfusion ./version.sh > version.h +API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* $[1-9][0-9]*$.*/\1/'` git add version.h git commit -m "generated version.h" version.h -git archive --prefix="${package}-${branch}-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}-${tag}.tar.bz2 +git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2 popd >/dev/null Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- x264.spec 23 Nov 2012 23:28:56 -0000 1.50 +++ x264.spec 19 Jan 2013 11:26:02 -0000 1.51 @@ -1,5 +1,6 @@ -%global gitdate 20121118 -%global gitversion f6a8615 +%global api 129 +%global gitdate 20130119 +%global gitversion 9c4ba4b %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -22,18 +23,16 @@ Summary: H264/AVC video streams encoder Name: x264 -Version: 0.128 -Release: 2%{?gver}%{?dist} +Version: 0.%{api} +Release: 1%{?gver}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html -Source0: %{name}-%{branch}-%{snapshot}.tar.bz2 +Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 Source1: x264-snapshot.sh # don't remove config.h and don't re-run version.sh Patch0: x264-nover.patch -#upstreamable patches -Patch100: x264-gf_malloc.patch %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel} %{!?_without_libavformat:BuildRequires: ffmpeg-devel} @@ -87,18 +86,18 @@ %prep -%setup -q -c -n %{name}-%{branch}-%{snapshot} -pushd %{name}-%{branch}-%{snapshot} +%setup -q -c -n %{name}-0.%{api}-%{snapshot} +pushd %{name}-0.%{api}-%{snapshot} %patch0 -p1 -b .nover -%patch100 -p1 -b .gf_malloc popd + variants="generic generic10" %ifarch i686 variants="$variants simd" %endif for variant in $variants ; do rm -rf ${variant} - cp -pr %{name}-%{branch}-%{snapshot} ${variant} + cp -pr %{name}-0.%{api}-%{snapshot} ${variant} done @@ -170,11 +169,11 @@ %files libs %defattr(644, root, root, 0755) -%{_libdir}/libx264.so.* +%{_libdir}/libx264.so.%{api} %ifarch i686 -%{_libdir}/sse2/libx264.so.* +%{_libdir}/sse2/libx264.so.%{api} %endif -%{_libdir}/libx26410b.so.* +%{_libdir}/libx26410b.so.%{api} %files devel %defattr(644, root, root, 0755) @@ -189,6 +188,11 @@ %{_libdir}/libx26410b.so %changelog +* Sat Jan 19 2013 Sérgio Basto <sergio(a)serjux.com> - 0.129-1.20130119git9c4ba4b +- Update to 9c4ba4bde8965571159eae2d79f85cabbb47416c, soname bump. +- Changed branch name by api number, is more readable. +- Drop upstreamed patch. + * Fri Nov 23 2012 Sérgio Basto <sergio(a)serjux.com> - 0.128-2.20121118gitf6a8615 - unbootstrap on F18.

11 years, 10 months

1
0
0 / 0

rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec,1.93,1.94

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13491 Modified Files: xorg-x11-drv-nvidia.spec Log Message: * Fri Jan 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-5 - move blacklist to %{_prefix}/lib/modprobe.d/ Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- xorg-x11-drv-nvidia.spec 10 Jan 2013 15:40:29 -0000 1.93 +++ xorg-x11-drv-nvidia.spec 18 Jan 2013 10:04:33 -0000 1.94 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 304.64 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -174,8 +174,8 @@ echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf #Blacklist nouveau (since F-11) -install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ -install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ +install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ +install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ # Install initscript #install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia @@ -330,7 +330,7 @@ %config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf } %config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf -%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf +%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf #{_initrddir}/nvidia %{_bindir}/nvidia-bug-report.sh @@ -378,6 +378,9 @@ %changelog +* Fri Jan 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-5 +- move blacklist to %%{_prefix}/lib/modprobe.d/ + * Thu Jan 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-4 - Fix preun scriptlet

11 years, 10 months

1
0
0 / 0

rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.94,1.95

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13278 Modified Files: xorg-x11-drv-nvidia.spec Log Message: * Fri Jan 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-2 - move blacklist to %{_prefix}/lib/modprobe.d/ 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.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- xorg-x11-drv-nvidia.spec 16 Jan 2013 14:18:35 -0000 1.94 +++ xorg-x11-drv-nvidia.spec 18 Jan 2013 10:00:41 -0000 1.95 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 313.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -172,8 +172,8 @@ echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf #Blacklist nouveau (since F-11) -install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ -install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ +install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ +install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ # Install initscript #install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia @@ -322,7 +322,7 @@ %config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf } %config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf -%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf +%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf #{_initrddir}/nvidia %{_bindir}/nvidia-bug-report.sh @@ -366,6 +366,9 @@ %changelog +* Fri Jan 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-2 +- move blacklist to %%{_prefix}/lib/modprobe.d/ + * Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1 - Update to 313.18

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits January 2013