rpms/buffer/devel .cvsignore, 1.4, 1.5 01-debian-patches.all, 1.2, 1.3 buffer.spec, 1.3, 1.4 sources, 1.3, 1.4
Bruno Cornec
bcornec at fedoraproject.org
Tue Jan 13 17:15:46 UTC 2009
Author: bcornec
Update of /cvs/pkgs/rpms/buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19735
Modified Files:
.cvsignore 01-debian-patches.all buffer.spec sources
Log Message:
Split the patch causing problem due to rcsid expansion in a separate one with a diff --unified=2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 Jan 2009 10:04:11 -0000 1.4
+++ .cvsignore 13 Jan 2009 17:15:16 -0000 1.5
@@ -1,2 +1 @@
-01-debian-patches.all
-buffer-1.19.tar.gz
+02-fedora-patch.all
Index: 01-debian-patches.all
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/01-debian-patches.all,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 01-debian-patches.all 13 Jan 2009 10:20:35 -0000 1.2
+++ 01-debian-patches.all 13 Jan 2009 17:15:16 -0000 1.3
@@ -19,7 +19,7 @@
* Added -m option to specify how much shared memory to grab.
* Now tries to fill this with blocks.
* reader waits for writer to terminate and then frees the shared mem and sems.
-@@ -112,6 +112,9 @@
+@@ -112,11 +112,15 @@
* Initial revision
*
*/
@@ -29,26 +29,13 @@
#include <unistd.h>
#include <stdio.h>
#include <signal.h>
-@@ -123,15 +126,16 @@
- #include <sys/shm.h>
- #include <sys/sem.h>
- #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <errno.h>
+#include <sys/time.h>
- #include "sem.h"
-
- #ifndef lint
- static char *rcsid = "$Header$";
- #endif
-
--#ifndef __alpha
-+#ifndef __linux__
- extern char *shmat();
--#endif /* __alpha */
-+#endif /* __linux__ */
-
- /* General macros */
- #define TRUE 1
-@@ -139,6 +143,14 @@ extern char *shmat();
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ipc.h>
+@@ -139,6 +143,14 @@
#define K *1024
#define M *1024*1024
Index: buffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/buffer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buffer.spec 13 Jan 2009 10:06:27 -0000 1.3
+++ buffer.spec 13 Jan 2009 17:15:16 -0000 1.4
@@ -13,6 +13,7 @@
Url: http://hello-penguin.com/software/buffer
Source: http://hello-penguin.com/software/buffer/%{name}-%{version}.tar.gz
Patch0: 01-debian-patches.all
+Patch1: 02-fedora-patch.all
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -28,6 +29,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Jan 2009 10:04:11 -0000 1.3
+++ sources 13 Jan 2009 17:15:16 -0000 1.4
@@ -1,2 +1 @@
-b16e46c0c04dd86234c6d7cc6c1eec9a 01-debian-patches.all
-35951ffca7e4df9ad7f97092e1f05b75 buffer-1.19.tar.gz
+b16176e87c5f0e1561483c39f20802ef 02-fedora-patch.all
More information about the fedora-extras-commits
mailing list