rpms/libaacs/devel sources, 1.4, 1.5 libaacs.spec, 1.3, 1.4 .cvsignore, 1.4, 1.5
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12079
Modified Files:
sources libaacs.spec .cvsignore
Log Message:
0.4.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Mar 2012 20:02:14 -0000 1.4
+++ sources 21 May 2012 19:47:49 -0000 1.5
@@ -1 +1 @@
-88e2410b3de34fb70586fc5cb076ff83 libaacs-0.3.1.tar.bz2
+928c977f5df3b59278c85d1186d3b148 libaacs-0.4.0.tar.bz2
Index: libaacs.spec
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/libaacs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libaacs.spec 22 Mar 2012 20:02:14 -0000 1.3
+++ libaacs.spec 21 May 2012 19:47:49 -0000 1.4
@@ -4,7 +4,7 @@
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
-Version: 0.3.1
+Version: 0.4.0
%if %{snapshot}
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
%else
@@ -86,6 +86,7 @@
%defattr(-,root,root,-)
%doc COPYING KEYDB.cfg ChangeLog README.txt
%{_libdir}/*.so.*
+%{_bindir}/aacs_info
%files devel
@@ -96,6 +97,9 @@
%changelog
+* Mon May 07 2012 Xavier Bachelot <xavier(a)bachelot.org> 0.4.0-1
+- Update to 0.4.0.
+
* Thu Mar 22 2012 Xavier Bachelot <xavier(a)bachelot.org> 0.3.1-1
- Update to 0.3.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 22 Mar 2012 20:02:14 -0000 1.4
+++ .cvsignore 21 May 2012 19:47:49 -0000 1.5
@@ -1 +1 @@
-libaacs-0.3.1.tar.bz2
+libaacs-0.4.0.tar.bz2
12 years, 4 months
rpms/ogmrip/F-16 .cvsignore, 1.9, 1.10 ogmrip.spec, 1.11, 1.12 sources, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11692
Modified Files:
.cvsignore ogmrip.spec sources
Log Message:
New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Sep 2011 11:00:08 -0000 1.9
+++ .cvsignore 21 May 2012 10:00:33 -0000 1.10
@@ -1 +1 @@
-ogmrip-0.13.7.tar.gz
+ogmrip-0.13.8.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-16/ogmrip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ogmrip.spec 22 Sep 2011 11:00:09 -0000 1.11
+++ ogmrip.spec 21 May 2012 10:00:33 -0000 1.12
@@ -1,5 +1,5 @@
Name: ogmrip
-Version: 0.13.7
+Version: 0.13.8
Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
@@ -26,7 +26,6 @@
Requires: mplayer, mencoder, ogmtools, vorbis-tools, theora-tools
Requires: mkvtoolnix, lame
Requires: gpac
-Requires: subtitleripper
Requires: tesseract
Requires(post): GConf2
@@ -133,6 +132,15 @@
%changelog
+* Sat May 19 2012 Gianluca Sforna <giallu(a)gmail.com> - 0.13.8-1
+- new upstream release
+
+* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.13.7-3
+- Orphan subtitleripper
+
+* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.13.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Thu Sep 22 2011 Gianluca Sforna <giallu(a)gmail.com> - 0.13.7-1
- new upstream release
- drop upstreamed patches
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Sep 2011 11:00:09 -0000 1.9
+++ sources 21 May 2012 10:00:33 -0000 1.10
@@ -1 +1 @@
-f91982e9f0564a8001e77b9fcf889a7c ogmrip-0.13.7.tar.gz
+3b48ae460edf046fdb241df09289b40d ogmrip-0.13.8.tar.gz
12 years, 4 months
rpms/ogmrip/F-17 .cvsignore, 1.9, 1.10 ogmrip.spec, 1.13, 1.14 sources, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8721
Modified Files:
.cvsignore ogmrip.spec sources
Log Message:
New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-17/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Sep 2011 11:00:08 -0000 1.9
+++ .cvsignore 21 May 2012 09:28:18 -0000 1.10
@@ -1 +1 @@
-ogmrip-0.13.7.tar.gz
+ogmrip-0.13.8.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-17/ogmrip.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ogmrip.spec 15 May 2012 21:27:39 -0000 1.13
+++ ogmrip.spec 21 May 2012 09:28:18 -0000 1.14
@@ -1,6 +1,6 @@
Name: ogmrip
-Version: 0.13.7
-Release: 3%{?dist}
+Version: 0.13.8
+Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -26,7 +26,6 @@
Requires: mplayer, mencoder, ogmtools, vorbis-tools, theora-tools
Requires: mkvtoolnix, lame
Requires: gpac
-#Requires: subtitleripper - orphaned
Requires: tesseract
Requires(post): GConf2
@@ -133,6 +132,9 @@
%changelog
+* Sat May 19 2012 Gianluca Sforna <giallu(a)gmail.com> - 0.13.8-1
+- new upstream release
+
* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.13.7-3
- Orphan subtitleripper
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-17/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Sep 2011 11:00:09 -0000 1.9
+++ sources 21 May 2012 09:28:18 -0000 1.10
@@ -1 +1 @@
-f91982e9f0564a8001e77b9fcf889a7c ogmrip-0.13.7.tar.gz
+3b48ae460edf046fdb241df09289b40d ogmrip-0.13.8.tar.gz
12 years, 4 months
rpms/ogmrip/devel .cvsignore, 1.9, 1.10 ogmrip.spec, 1.13, 1.14 sources, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7778
Modified Files:
.cvsignore ogmrip.spec sources
Log Message:
New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Sep 2011 11:00:08 -0000 1.9
+++ .cvsignore 21 May 2012 09:19:51 -0000 1.10
@@ -1 +1 @@
-ogmrip-0.13.7.tar.gz
+ogmrip-0.13.8.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/ogmrip.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ogmrip.spec 15 May 2012 21:27:39 -0000 1.13
+++ ogmrip.spec 21 May 2012 09:19:51 -0000 1.14
@@ -1,6 +1,6 @@
Name: ogmrip
-Version: 0.13.7
-Release: 3%{?dist}
+Version: 0.13.8
+Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -26,7 +26,6 @@
Requires: mplayer, mencoder, ogmtools, vorbis-tools, theora-tools
Requires: mkvtoolnix, lame
Requires: gpac
-#Requires: subtitleripper - orphaned
Requires: tesseract
Requires(post): GConf2
@@ -133,6 +132,9 @@
%changelog
+* Sat May 19 2012 Gianluca Sforna <giallu(a)gmail.com> - 0.13.8-1
+- new upstream release
+
* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.13.7-3
- Orphan subtitleripper
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Sep 2011 11:00:09 -0000 1.9
+++ sources 21 May 2012 09:19:51 -0000 1.10
@@ -1 +1 @@
-f91982e9f0564a8001e77b9fcf889a7c ogmrip-0.13.7.tar.gz
+3b48ae460edf046fdb241df09289b40d ogmrip-0.13.8.tar.gz
12 years, 4 months
rpms/xorg-x11-drv-nvidia-173xx/F-16 xorg-x11-drv-nvidia-173xx.spec, 1.23, 1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5447/F-16
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Log Message:
Fix broken post install script
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-nvidia-173xx.spec 19 May 2012 18:12:04 -0000 1.23
+++ xorg-x11-drv-nvidia-173xx.spec 20 May 2012 10:05:46 -0000 1.24
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.34
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -248,11 +248,14 @@
ISGRUB1="--grub"
fi
if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby $ISGRUB1 \
- --update-kernel=${GRUBBYLASTKERNEL} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
- &>/dev/null
+ KERNELS=`/sbin/grubby --default-kernel`
+ [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
+ done
fi
fi || :
@@ -324,6 +327,9 @@
%changelog
+* Sun May 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.34-3
+- Fix %%post when grubby --default-kernel is broken
+
* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com> - 173.14.34-2
- add changes for grub2
12 years, 4 months
rpms/xorg-x11-drv-nvidia-173xx/F-17 xorg-x11-drv-nvidia-173xx.spec, 1.22, 1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5447/F-17
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Log Message:
Fix broken post install script
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drv-nvidia-173xx.spec 19 May 2012 20:38:29 -0000 1.22
+++ xorg-x11-drv-nvidia-173xx.spec 20 May 2012 10:05:47 -0000 1.23
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.34
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -248,11 +248,14 @@
ISGRUB1="--grub"
fi
if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby $ISGRUB1 \
- --update-kernel=${GRUBBYLASTKERNEL} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
- &>/dev/null
+ KERNELS=`/sbin/grubby --default-kernel`
+ [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
+ done
fi
fi || :
@@ -324,6 +327,9 @@
%changelog
+* Sun May 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.34-3
+- Fix %%post when grubby --default-kernel is broken
+
* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com> - 173.14.34-2
- add changes for grub2
12 years, 4 months
rpms/xorg-x11-drv-nvidia/F-17 xorg-x11-drv-nvidia.spec,1.77,1.78
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4802/F-17
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix nvidia post installation
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xorg-x11-drv-nvidia.spec 3 May 2012 16:58:24 -0000 1.77
+++ xorg-x11-drv-nvidia.spec 20 May 2012 10:00:49 -0000 1.78
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 295.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -260,11 +260,14 @@
ISGRUB1="--grub"
fi
if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby $ISGRUB1 \
- --update-kernel=${GRUBBYLASTKERNEL} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
- &>/dev/null
+ KERNELS=`/sbin/grubby --default-kernel`
+ [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
+ done
fi
fi || :
@@ -349,6 +352,9 @@
%changelog
+* Sun May 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.49-2
+- Fix %%post when grubby --default-kernel is broken
+
* Thu May 03 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.49-1
- Update to 295.49
12 years, 4 months
rpms/xorg-x11-drv-nvidia/F-16 xorg-x11-drv-nvidia.spec,1.75,1.76
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4802/F-16
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix nvidia post installation
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-drv-nvidia.spec 3 May 2012 17:02:17 -0000 1.75
+++ xorg-x11-drv-nvidia.spec 20 May 2012 10:00:49 -0000 1.76
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 295.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -260,11 +260,14 @@
ISGRUB1="--grub"
fi
if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby $ISGRUB1 \
- --update-kernel=${GRUBBYLASTKERNEL} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
- &>/dev/null
+ KERNELS=`/sbin/grubby --default-kernel`
+ [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
+ done
fi
fi || :
@@ -349,13 +352,16 @@
%changelog
+* Sun May 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.49-2
+- Fix %%post when grubby --default-kernel is broken
+
* Thu May 03 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.49-1
- Update to 295.49
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
- Update to 295.40
-* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.33-3
+* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.33-1
- Update to 295.33
* Tue Feb 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.20-1
12 years, 4 months
rpms/vdr-mp3/F-16 vdr-mp3-0.10.2-Makefile.patch, NONE, 1.1 vdr-mp3-0.10.2-fsf-fix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-mp3.spec, 1.5, 1.6
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-mp3/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30835/F-16
Modified Files:
.cvsignore sources vdr-mp3.spec
Added Files:
vdr-mp3-0.10.2-Makefile.patch vdr-mp3-0.10.2-fsf-fix.patch
Log Message:
vdr-mp3-0.10.2-Makefile.patch:
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE vdr-mp3-0.10.2-Makefile.patch ---
--- mp3-0.10.2/Makefile.orig 2012-05-11 23:41:20.963758554 +0200
+++ mp3-0.10.2/Makefile 2012-05-11 23:37:45.748768802 +0200
@@ -80,13 +80,13 @@
### The version number of VDR (taken from VDR's "config.h"):
-VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
-APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
ifeq ($(strip $(APIVERSION)),)
APIVERSION = $(VDRVERSION)
endif
-VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
-APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
ifeq ($(strip $(APIVERSNUM)),)
APIVERSNUM = $(VDRVERSNUM)
endif
@@ -98,7 +98,7 @@
### Includes and Defines (add further entries here):
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES += -I$(INCDIR)/vdr/
DEFINES += -D_GNU_SOURCE -DAPIVERSNUM=$(APIVERSNUM)
### The object files (add further files here):
@@ -154,7 +154,7 @@
I18Nmsgs := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo),$(I18Npots)))
I18Nmsgs2 := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo2),$(I18Npots)))
-HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(VDRDIR)/include/vdr/i18n.h)
+HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(INCDIR)/vdr/i18n.h)
ifeq ($(strip $(HASLOCALE)),)
COM_OBJS += i18n.o
endif
vdr-mp3-0.10.2-fsf-fix.patch:
COPYING | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vdr-mp3-0.10.2-fsf-fix.patch ---
--- mp3-0.10.2/COPYING.orig 2012-05-05 17:54:21.646516046 +0200
+++ mp3-0.10.2/COPYING 2012-05-05 17:57:49.785534163 +0200
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-16/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Aug 2008 18:46:44 -0000 1.2
+++ .cvsignore 20 May 2012 08:23:33 -0000 1.3
@@ -1,2 +1,2 @@
mplayer.sh-0.8.7.tar.gz
-vdr-mp3-0.10.1.tar.gz
+vdr-mp3-0.10.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-16/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Aug 2008 18:46:44 -0000 1.2
+++ sources 20 May 2012 08:23:33 -0000 1.3
@@ -1,2 +1,2 @@
cc2e48d4787b7ee739a0a8bb5b8c9fb2 mplayer.sh-0.8.7.tar.gz
-ca43583a7ccc9491bf24362dd6bebf4b vdr-mp3-0.10.1.tar.gz
+66fd37827326776c223a0fdd0ad3811e vdr-mp3-0.10.2.tar.gz
Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-16/vdr-mp3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-mp3.spec 29 Mar 2009 14:19:13 -0000 1.5
+++ vdr-mp3.spec 20 May 2012 08:23:34 -0000 1.6
@@ -3,18 +3,9 @@
# - patch to allow playing audio files (currently insists to find video)
# - audio CD support?
-%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
-%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
-%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
-%define datadir %(vdr-config --datadir 2>/dev/null || echo ERROR)
-%define cachedir %(vdr-config --cachedir 2>/dev/null || echo ERROR)
-%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR)
-%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR)
-
Name: vdr-mp3
-Version: 0.10.1
-Release: 8%{?dist}
+Version: 0.10.2
+Release: 4%{?dist}
Summary: Sound playback plugin for VDR
Group: Applications/Multimedia
@@ -32,15 +23,17 @@
Patch2: %{name}-mplayer.sh-identify.patch
Patch3: %{name}-mplayer.sh-0.8.7-defaults.patch
Patch4: %{name}-0.10.1-no-debug.patch
+Patch5: %{name}-0.10.2-Makefile.patch
+Patch6: %{name}-0.10.2-fsf-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: vdr-devel >= 1.4.0
+BuildRequires: vdr-devel >= 1.6.0-41
BuildRequires: libsndfile-devel >= 1.0.0
BuildRequires: libvorbis-devel
BuildRequires: %{__perl}
BuildRequires: libmad-devel
BuildRequires: libid3tag-devel
-Requires: vdr(abi) = %{apiver}
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
Requires: netpbm-progs
Requires: mjpegtools >= 1.8.0
Requires: file
@@ -53,8 +46,8 @@
Summary: MPlayer plugin for VDR
Group: Applications/Multimedia
BuildRequires: %{__perl}
-Requires: vdr(abi) = %{apiver}
-Requires: mplayer >= 1.0-0.lvn.0.19.pre7
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: mplayer >= 1.0
%description -n vdr-mplayer
The MPlayer plugin adds the ability to call MPlayer from within VDR,
@@ -69,87 +62,85 @@
%patch2
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%{__perl} -pi -e \
- 's|CFGFIL=.*|CFGFIL="%{configdir}/plugins/mplayer.sh.conf"|' \
+ 's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \
mplayer.sh
%{__perl} -pi -e \
- 's|"/var/cache/images/mp3"|"%{cachedir}/mp3/images"|' \
+ 's|"/var/cache/images/mp3"|"%{vdr_cachedir}/mp3/images"|' \
data-mp3.c README
%{__perl} -pi -e \
- 's|"/video/plugins/DVD-VCD"|"%{datadir}/DVD-VCD"| ;
+ 's|"/video/plugins/DVD-VCD"|"%{vdr_datadir}/DVD-VCD"| ;
s|^MPLAYER=.*|MPLAYER="%{_bindir}/mplayer"|' \
mplayer.sh.conf
for f in HISTORY MANUAL README ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
-sed -e 's|/var/lib/vdr|%{vardir}|' %{SOURCE4} > %{name}-mplayer.conf
+sed -e 's|/var/lib/vdr|%{vdr_vardir}|' %{SOURCE4} > %{name}-mplayer.conf
%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \
libvdr-mp3.so libvdr-mplayer.so
-echo "%{datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
+echo "%{vdr_datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
%install
rm -rf $RPM_BUILD_ROOT
# Common dirs
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}
-install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
# Common files
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{plugindir}/bin/mediasources.sh
+install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mediasources.sh
install -pm 755 examples/mount.sh.example \
- $RPM_BUILD_ROOT%{plugindir}/bin/mount.sh
+ $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mount.sh
# MP3 files
-install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{configdir}/plugins/mp3sources.conf
+install -pm 755 libvdr-mp3.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{vdr_configdir}/plugins/mp3sources.conf
install -pm 755 examples/image_convert.sh.example \
- $RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
-%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
+ $RPM_BUILD_ROOT%{vdr_plugindir}/bin/image_convert.sh
+%{__perl} -pe 's|/var/cache/vdr/|%{vdr_cachedir}/|' %{SOURCE3} \
> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
-install -dm 755 $RPM_BUILD_ROOT%{cachedir}/mp3/images
-i=$RPM_BUILD_ROOT%{cachedir}/mp3/id3info.cache ; > $i ; chmod 644 $i
+install -dm 755 $RPM_BUILD_ROOT%{vdr_cachedir}/mp3/images
+i=$RPM_BUILD_ROOT%{vdr_cachedir}/mp3/id3info.cache ; > $i ; chmod 644 $i
# MPlayer files
-install -pm 755 libvdr-mplayer.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/DVD-VCD
-touch $RPM_BUILD_ROOT%{datadir}/DVD-VCD/{DVD,VCD}
-chmod 644 $RPM_BUILD_ROOT%{datadir}/DVD-VCD/*
+install -pm 755 libvdr-mplayer.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD
+touch $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD/{DVD,VCD}
+chmod 644 $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD/*
install -pm 644 mplayersources.conf mplayer.sh.conf \
- $RPM_BUILD_ROOT%{configdir}/plugins
-install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{plugindir}/bin/mplayer.sh
-install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{plugindir}/bin/mplayer-minimal.sh
+ $RPM_BUILD_ROOT%{vdr_configdir}/plugins
+install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mplayer.sh
+install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mplayer-minimal.sh
install -pm 644 %{name}-mplayer.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
-install -dm 755 $RPM_BUILD_ROOT%{vardir}
-i=$RPM_BUILD_ROOT%{vardir}/global.mplayer.resume ; > $i ; chmod 644 $i
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}
+i=$RPM_BUILD_ROOT%{vdr_vardir}/global.mplayer.resume ; > $i ; chmod 644 $i
%post
if [ $1 -eq 1 ] ; then
- %{plugindir}/bin/mediasources.sh \
- >> %{configdir}/plugins/mp3sources.conf || :
+ %{vdr_plugindir}/bin/mediasources.sh \
+ >> %{vdr_configdir}/plugins/mp3sources.conf || :
else
r=global.mplayer.resume
- if [ -f %{videodir}/$r -a ! -f %{vardir}/$r ] ; then
- mv %{videodir}/$r %{vardir}/$r
+ if [ -f %{vdr_videodir}/$r -a ! -f %{vdr_vardir}/$r ] ; then
+ mv %{vdr_videodir}/$r %{vdr_vardir}/$r
fi
fi
%post -n vdr-mplayer
if [ $1 -eq 1 ] ; then
- %{plugindir}/bin/mediasources.sh \
- >> %{configdir}/plugins/mplayersources.conf || :
+ %{vdr_plugindir}/bin/mediasources.sh \
+ >> %{vdr_configdir}/plugins/mplayersources.conf || :
fi
@@ -157,33 +148,52 @@
%defattr(-,root,root,-)
%doc COPYING HISTORY MANUAL README examples/mount.sh.example
%doc examples/mp3sources.conf.example examples/network.sh.example
-%config(noreplace) %{configdir}/plugins/mp3sources.conf
+%config(noreplace) %{vdr_configdir}/plugins/mp3sources.conf
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
-%{plugindir}/libvdr-mp3.so.%{apiver}
-%{plugindir}/bin/image_convert.sh
-%{plugindir}/bin/mediasources.sh
-%{plugindir}/bin/mount.sh
+%{vdr_plugindir}/libvdr-mp3.so.%{vdr_apiversion}
+%{vdr_plugindir}/bin/image_convert.sh
+%{vdr_plugindir}/bin/mediasources.sh
+%{vdr_plugindir}/bin/mount.sh
%defattr(-,%{vdr_user},root,-)
-%dir %{cachedir}/mp3/
-%dir %{cachedir}/mp3/images/
-%ghost %{cachedir}/mp3/id3info.cache
+%dir %{vdr_cachedir}/mp3/
+%dir %{vdr_cachedir}/mp3/images/
+%ghost %{vdr_cachedir}/mp3/id3info.cache
%files -n vdr-mplayer
%defattr(-,root,root,-)
%doc COPYING HISTORY MANUAL README examples/mplayer.sh.example
%doc examples/mount.sh.example
-%config(noreplace) %{configdir}/plugins/mplayer*.conf
+%config(noreplace) %{vdr_configdir}/plugins/mplayer*.conf
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
-%{plugindir}/libvdr-mplayer.so.%{apiver}
-%{plugindir}/bin/mediasources.sh
-%{plugindir}/bin/mount.sh
-%{plugindir}/bin/mplayer*.sh
-%{datadir}/DVD-VCD/
+%{vdr_plugindir}/libvdr-mplayer.so.%{vdr_apiversion}
+%{vdr_plugindir}/bin/mediasources.sh
+%{vdr_plugindir}/bin/mount.sh
+%{vdr_plugindir}/bin/mplayer*.sh
+%{vdr_datadir}/DVD-VCD/
%defattr(-,%{vdr_user},root,-)
-%ghost %{vardir}/global.mplayer.resume
+%ghost %{vdr_vardir}/global.mplayer.resume
%changelog
+* Sat May 19 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.10.2-4
+- reset the release tag to 1 for release update
+
+* Tue May 15 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.10.2-3
+- added correct permissions for vdr_vardir and vdr_cachedir
+
+* Mon May 14 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.10.2-2
+- more cleanups
+- fixed the use of vdr macros
+
+* Sun May 13 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.10.2-1
+- Rebuilt for new release
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.1-10
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.10.1-8
- rebuild for new F11 features
12 years, 4 months
rpms/xorg-x11-drv-nvidia-173xx/F-17 sources, 1.8, 1.9 xorg-x11-drv-nvidia-173xx.spec, 1.21, 1.22 filter-provides.sh, 1.3, NONE filter-requires.sh, 1.5, NONE nvidia-173xx-config-display, 1.5, NONE nvidia-173xx-init, 1.5, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22042
Modified Files:
sources xorg-x11-drv-nvidia-173xx.spec
Removed Files:
filter-provides.sh filter-requires.sh
nvidia-173xx-config-display nvidia-173xx-init
Log Message:
* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com> - 173.14.34-2
- add changes for grub2
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-nvidia-173xx.spec 30 Apr 2011 23:06:47 -0000 1.21
+++ xorg-x11-drv-nvidia-173xx.spec 19 May 2012 20:38:29 -0000 1.22
@@ -1,14 +1,11 @@
-%define nvidialibdir %{_libdir}/nvidia
+%global nvidialibdir %{_libdir}/nvidia
-# 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-173xx
-Version: 173.14.30
-Release: 1%{?dist}
+Version: 173.14.34
+Release: 2%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,19 +13,10 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source2: 00-nvidia.conf
-Source3: nvidia-173xx-xorg.conf
-#Source5: nvidia-173xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-173xx-xorg.conf
Source6: blacklist-nouveau.conf
-Source10: nvidia-173xx-config-display
Source11: nvidia-173xx-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
-%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
@@ -73,6 +61,20 @@
Obsoletes: nvidia-x11-drv-97xx < %{version}-%{release}
Provides: nvidia-x11-drv-97xx = %{version}-%{release}
+%{?filter_setup:
+%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGL\.so/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 /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_from_requires /^libglx\.so/d;
+%filter_setup
+}
+
%description
This package provides the legacy NVIDIA display driver of the 173xx serie
which allows for hardware accelerated rendering with NVIDIA chipsets
@@ -113,12 +115,6 @@
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
-# 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
%else
@@ -210,12 +206,6 @@
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
-# X configuration script
-#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
-
-# Install initscript
-#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
-
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
@@ -228,7 +218,7 @@
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
# Remove execstack needs on F-12 and laters
-%if 0
+%if 1
find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -253,22 +243,18 @@
%post
if [ "$1" -eq "1" ]; then
- # Enable nvidia driver when installing
- #%{_sbindir}/nvidia-173xx-config-display enable &>/dev/null ||:
- # Add init script and start it
- #/sbin/chkconfig --add nvidia-173xx ||:
- #/etc/init.d/nvidia-173xx start &>/dev/null ||:
+ ISGRUB1=""
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ ISGRUB1="--grub"
+ fi
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
- fi
-fi
-if [ -x /usr/sbin/setsebool ] ; then
- SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
- if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
- /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${GRUBBYLASTKERNEL} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
fi
-fi ||:
+fi || :
%post libs -p /sbin/ldconfig
@@ -278,18 +264,18 @@
%preun
if [ "$1" -eq "0" ]; then
- # Disable driver on final removal
- test -f %{_sbindir}/nvidia-173xx-config-display && %{_sbindir}/nvidia-173xx-config-display disable &>/dev/null ||:
- #%_initrddir}/nvidia-173xx stop &> /dev/null ||:
- #/sbin/chkconfig --del nvidia-173xx ||:
- #Clear grub option to disable nouveau for all kernels
- if [ -x /sbin/grubby ] ; then
- KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
- for kernel in ${KERNELS} ; do
- /sbin/grubby --update-kernel=${kernel} \
- --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
- done
- fi
+ ISGRUB1=""
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ ISGRUB1="--grub"
+ fi
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null
+ done
+ fi
#Backup and disable previously used xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] && \
mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
@@ -338,6 +324,16 @@
%changelog
+* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com> - 173.14.34-2
+- add changes for grub2
+
+* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com> - 173.14.34-1
+- Update to 173.14.34
+
+* Mon Jul 25 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.31-1
+- Update to 173.14.31
+- Rebase with main serie packaging improvements
+
* Sun May 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.30-1
- Update to 173.14.30
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---
--- nvidia-173xx-config-display DELETED ---
--- nvidia-173xx-init DELETED ---
12 years, 4 months