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: 14-Oct-2005 21:32:05
Branch: HEAD Handle: 2005101420320400
Added files:
openpkg-src/diogene87 diogene87.patch
Modified files:
openpkg-src/diogene87 diogene87.spec
Log:
add narcisse81, a X11/Gtk GUI for diogene87
Summary:
Revision Changes Path
1.1 +41 -0 openpkg-src/diogene87/diogene87.patch
1.9 +40 -6 openpkg-src/diogene87/diogene87.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/diogene87/diogene87.patch
============================================================================
$ cvs diff -u -r0 -r1.1 diogene87.patch
--- /dev/null 2005-10-14 21:31:38 +0200
+++ diogene87.patch 2005-10-14 21:32:05 +0200
@@ -0,0 +1,41 @@
+Index: src/Makefile
+--- src/Makefile.orig 2005-10-12 20:37:57 +0200
++++ src/Makefile 2005-10-14 21:28:04 +0200
+@@ -1,6 +1,6 @@
+ CC=gcc
+ LDLIBS=`gtk-config --libs`
+-CFLAGS=-Wall -Werror -g `gtk-config --cflags`
++CFLAGS=`gtk-config --cflags`
+
+ OBJECTS = main.o mainmenu.o global.o icon.o command.o \
+ ref_view.o ref_edit.o ref_dele.o ref_copy.o ref_plan.o \
+@@ -24,7 +24,7 @@
+ user_view.o user_edit.o user_dele.o \
+ monitor.o connection.o about.o graph.o message.o
+
+-all: run
++all: narcisse81
+
+ run: narcisse81
+ ./narcisse81 -s
+@@ -33,7 +33,7 @@
+ $(CC) $(CFLAGS) -c $< -o $@
+
+ narcisse81: $(OBJECTS)
+- $(CC) $(LDLIBS) $(OBJECTS) -o narcisse81
++ $(CC) $(OBJECTS) -o narcisse81 $(LDLIBS)
+
+ main.o: main.c global.h icon.h
+ mainmenu.o: mainmenu.c global.h icon.h
+Index: src/main.c
+--- src/main.c.orig 2005-10-11 20:38:40 +0200
++++ src/main.c 2005-10-14 21:28:09 +0200
+@@ -27,7 +27,7 @@
+ #include "global.h"
+ #include "icon.h"
+
+-static GtkWidget *main_window;
++GtkWidget *main_window;
+ static GtkWidget *actual_form = NULL;
+ static GtkWidget *form_container;
+ static GtkWidget *menu_item_edit;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/diogene87/diogene87.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 diogene87.spec
--- openpkg-src/diogene87/diogene87.spec 11 Sep 2005 17:37:29 -0000
1.8
+++ openpkg-src/diogene87/diogene87.spec 14 Oct 2005 19:32:04 -0000
1.9
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_diogene87 1.0.0pre1
+%define V_narcisse81 0.0.4
+
# package information
Name: diogene87
Summary: Job Scheduling System
@@ -32,16 +36,19 @@
Class: EVAL
Group: System
License: GPL
-Version: 1.0.0pre1
-Release: 20050911
+Version: %{V_diogene87}
+Release: 20051014
# package options
%option with_fsl yes
+%option with_x11 yes
# list of sources
-Source0:
http://osdn.dl.sourceforge.net/diogene87/diogene87-%{version}.tar.gz
-Source1: rc.diogene87
-Source2: fsl.diogene87
+Source0:
http://osdn.dl.sourceforge.net/diogene87/diogene87-%{V_diogene87}.tar.gz
+Source1:
http://osdn.dl.sourceforge.net/narcisse81/narcisse81-%{V_narcisse81}.tar.gz
+Source2: rc.diogene87
+Source3: fsl.diogene87
+Patch0: diogene87.patch
# build information
Prefix: %{l_prefix}
@@ -52,6 +59,10 @@
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11, gtk
+PreReq: X11, gtk
+%endif
AutoReq: no
AutoReqProv: no
@@ -63,13 +74,22 @@
%track
prog diogene87 = {
- version = %{version}
+ version = %{V_diogene87}
url = http://prdownloads.sourceforge.net/diogene87/
regex = diogene87-(__VER__)\.tar\.gz
}
+ prog diogene87:narcisse81 = {
+ version = %{V_narcisse81}
+ url = http://prdownloads.sourceforge.net/narcisse81/
+ regex = narcisse81-(__VER__)\.tar\.gz
+ }
%prep
%setup -q
+%if "%{with_x11}" == "yes"
+ %setup -q -T -D -a 1
+ %patch -p0 -d narcisse81-%{V_narcisse81}
+%endif
%build
# configure program
@@ -90,11 +110,25 @@
# build program
%{l_make} %{l_mflags -O}
+%if "%{with_x11}" == "yes"
+ # build GUI
+ ( cd narcisse81-%{V_narcisse81}/src
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+%endif
+
%install
# install program
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+%if "%{with_x11}" == "yes"
+ # install GUI
+ %{l_shtool} install -c -s -m 755 \
+ narcisse81-%{V_narcisse81}/src/narcisse81 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/
+%endif
+
# strip down installation files
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/diogene87
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
