OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-May-2008 20:27:38
Branch: HEAD Handle: 2008052119273800
Modified files:
openpkg-src/xjobs xjobs.patch xjobs.spec
Log:
upgrading package: xjobs 20080322 -> 20080520
Summary:
Revision Changes Path
1.6 +26 -21 openpkg-src/xjobs/xjobs.patch
1.11 +9 -9 openpkg-src/xjobs/xjobs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xjobs/xjobs.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 xjobs.patch
--- openpkg-src/xjobs/xjobs.patch 14 Feb 2008 08:22:31 -0000 1.5
+++ openpkg-src/xjobs/xjobs.patch 21 May 2008 18:27:38 -0000 1.6
@@ -1,20 +1,25 @@
-Index: Makefile
---- Makefile.orig 2008-02-13 15:51:44 +0100
-+++ Makefile 2008-02-14 09:20:29 +0100
-@@ -25,8 +25,8 @@
- CC = cc
- CFLAGS = -O $(LFS_CFLAGS) $(HAVESPAWN)
- #CFLAGS = -g $(LFS_CFLAGS) #$(HAVESPAWN) -DDEBUGLEX
--LDFLAGS = -lm $(LFS_LDFLAGS)
--LIBS = $($(OS)-LIBS) $(LFS_LIBS)
-+LDFLAGS = $(LFS_LDFLAGS)
-+LIBS = $($(OS)-LIBS) $(LFS_LIBS) -lm
- RM = rm -f
- MKDIR = mkdir -p
- CP = cp
+Index: Makefile.in
+--- Makefile.in.orig 2008-05-20 21:31:54 +0200
++++ Makefile.in 2008-05-21 20:24:20 +0200
+@@ -25,7 +25,7 @@
+ $(OBJECTS): config.h Makefile
+
+ $(TARGET): $(OBJECTS)
+- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) -c $< -o $@
+@@ -43,4 +43,5 @@
+ install: $(TARGET)
+ -$(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
+- $(INSTALL) xjobs.1 $(mandir)
++ -$(INSTALL) -d $(DESTDIR)$(mandir)
++ $(INSTALL) xjobs.1 $(DESTDIR)$(mandir)
Index: tokenizer.l
---- tokenizer.l.orig 2008-02-13 11:30:47 +0100
-+++ tokenizer.l 2008-02-14 09:20:40 +0100
+--- tokenizer.l.orig 2008-05-20 21:31:54 +0200
++++ tokenizer.l 2008-05-21 20:23:53 +0200
@@ -1,11 +1,4 @@
%pointer
-%e 150
@@ -28,11 +33,11 @@
%{
/*
Index: xjobs.c
---- xjobs.c.orig 2008-02-13 15:51:38 +0100
-+++ xjobs.c 2008-02-14 09:16:21 +0100
-@@ -6,7 +6,6 @@
- /* To compile, we need SUS/XPG4v2 or later. */
- /*#define _XOPEN_SOURCE 500*/
+--- xjobs.c.orig 2008-05-20 21:31:54 +0200
++++ xjobs.c 2008-05-21 20:23:53 +0200
+@@ -7,7 +7,6 @@
+ #include "config.h"
+ #endif
-#include <alloca.h>
#include <assert.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xjobs/xjobs.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 xjobs.spec
--- openpkg-src/xjobs/xjobs.spec 23 Mar 2008 08:40:22 -0000 1.10
+++ openpkg-src/xjobs/xjobs.spec 21 May 2008 18:27:38 -0000 1.11
@@ -31,8 +31,8 @@
Class: EVAL
Group: ShellUtils
License: GPL
-Version: 20080322
-Release: 20080323
+Version: 20080520
+Release: 20080521
# list of sources
Source0: http://www.maier-komor.de/xjobs/xjobs-%{version}.tgz
@@ -74,16 +74,16 @@
%patch -p0
%build
- %{l_make} %{l_mflags -O} \
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LEX="flex"
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
- MKDIR="%{l_shtool} mkdir -p"
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
