rpms/dvd+rw-tools/FC-6 dvd+rw-tools-7.0-phys.patch, NONE, 1.1 dvd+rw-tools.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25343

Modified Files:
	dvd+rw-tools.spec 
Added Files:
	dvd+rw-tools-7.0-phys.patch 
Log Message:
- use _SC_PHYS_PAGES instead of _SC_AVPHYS_PAGES to determine available memory
- Resolves: rhbz#216794


dvd+rw-tools-7.0-phys.patch:
 growisofs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE dvd+rw-tools-7.0-phys.patch ---
--- dvd+rw-tools-7.0/growisofs.c	2006-11-21 23:17:08.000000000 -0200
+++ dvd+rw-tools-7.0/growisofs.c.phys	2006-11-21 23:17:18.000000000 -0200
@@ -3096,12 +3096,12 @@ int main (int argc, char *argv[])
 
 #if defined(__unix) || defined(__unix__)
 
-#if defined(_SC_PAGESIZE) && defined(_SC_AVPHYS_PAGES)
-    { size_t phys_mem = (size_t)sysconf(_SC_AVPHYS_PAGES) *
+#if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
+    { size_t phys_mem = (size_t)sysconf(_SC_PHYS_PAGES) *
 			(size_t)sysconf(_SC_PAGESIZE);
 
 	if (phys_mem)
-	{   phys_mem /= 2;  /* normally AVPHYS is a bit smaller, so
+	{   phys_mem /= 2;  /* normally PHYS is a bit smaller, so
 			     *  we commonly land on 1/4 RAM */	
 	    while (the_buffer_size > phys_mem) the_buffer_size /= 2;
 	}


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-6/dvd+rw-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dvd+rw-tools.spec	3 Nov 2006 13:55:35 -0000	1.24
+++ dvd+rw-tools.spec	13 Dec 2006 14:00:39 -0000	1.25
@@ -1,12 +1,12 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.0
-Release: 	0%{dist}.2
+Release: 	0%{dist}.3
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
 Source1: 	index.html
-Patch: 		dvd+rw-tools-5.17.4.8.6.manpatch
+Patch: 		dvd+rw-tools-7.0-phys.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-root
@@ -18,29 +18,22 @@
 
 %prep
 %setup -q  -n %{name}-%{version}
-#%patch -p1 -b .manpatch
+%patch -p1 -b .phys
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
-make WARN="-DDEFAULT_BUF_SIZE_MB=16  -DRLIMIT_MEMLOCK"
+make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK"
 cp %SOURCE1 index.html
 
 %install
 rm -rf %{buildroot}
 %makeinstall
 
-# mkdir -p %{buildroot}%{_prefix}/bin
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-%{release}
-# mkdir -p %{buildroot}%{_mandir}/man1
-
-# cd %{_builddir}/%{name}-%{version}
-# cp -a	growisofs dvd+rw-format dvd+rw-booktype	\
-# 	%{buildroot}%{_prefix}/bin
 cp -a	index.html 				\
 	%{buildroot}%{_docdir}/%{name}-%{version}-%{release}
-# cp -a growisofs.1* %{buildroot}%{_mandir}/man1
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +45,10 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Wed Dec 13 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.3
+- use _SC_PHYS_PAGES instead of _SC_AVPHYS_PAGES to determine available memory
+- Resolves: rhbz#216794
+
 * Fri Nov 03 2006 Harald Hoyer <harald at redhat.com> - 7.0-0%{dist}.2
 - define RLIMIT_MEMLOCK, which should resolve the memlock problems