rpms/wyrd/devel wyrd-1.4.4-camlp5.patch,NONE,1.1 wyrd.spec,1.6,1.7

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/wyrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9447

Modified Files:
	wyrd.spec 
Added Files:
	wyrd-1.4.4-camlp5.patch 
Log Message:
* Tue Jul 08 2008 Till Maas <opensource at till.name> - 1.4.4-2
- fix BuildRequires, the ocaml-camlp4-devel seems to have vanished


wyrd-1.4.4-camlp5.patch:

--- NEW FILE wyrd-1.4.4-camlp5.patch ---
diff -up wyrd-1.4.4/Makefile.in.camlp5 wyrd-1.4.4/Makefile.in
--- wyrd-1.4.4/Makefile.in.camlp5	2008-02-22 05:25:24.000000000 +0100
+++ wyrd-1.4.4/Makefile.in	2008-07-08 00:44:13.000000000 +0200
@@ -45,11 +45,11 @@ LDFLAGS      = @LDFLAGS@
 CURSES_LIB = @CURSES_LIB@
 
 INCLUDES = -I ./curses
-BFLAGS   = -pp camlp4o -g $(INCLUDES)
-OFLAGS   = -pp camlp4o $(INCLUDES)
+BFLAGS   = -pp camlp5o -g $(INCLUDES)
+OFLAGS   = -pp camlp5o $(INCLUDES)
 BLFLAGS  = -custom -cclib '$(LDFLAGS) $(CURSES_LIB) -lm'
 OLFLAGS  = -cclib '$(LDFLAGS) $(CURSES_LIB) -lm'
-DEPFLAGS = -pp camlp4o
+DEPFLAGS = -pp camlp5o
 
 # main target
 #############
@@ -259,7 +259,7 @@ dist-clean distclean:: clean
 depend::
 #	$(MAKE) txtin_lexer.ml
 #	$(MAKE) txtin_parser.ml
-	$(OCAMLDEP) -pp camlp4o $(INCLUDES) *.ml *.mli > depend
+	$(OCAMLDEP) -pp camlp5o $(INCLUDES) *.ml *.mli > depend
 	$(OCAMLDEP) -pp 'cpp -P -xassembler-with-cpp' -I ./curses curses/*.ml curses/*.mli >> depend
 
 include depend


Index: wyrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wyrd/devel/wyrd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wyrd.spec	7 Jul 2008 22:12:13 -0000	1.6
+++ wyrd.spec	7 Jul 2008 23:04:46 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           wyrd
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A ncurses frontend for the calendar application remind
 
 Group:          Applications/Productivity
@@ -9,16 +9,12 @@
 Source0:        http://pessimization.com/software/wyrd/wyrd-%{version}.tar.gz
 Source1:        wyrd-wyrdrc.local
 Patch0:         wyrd-1.4.3-wyrdrc-local.patch
+Patch1:         wyrd-1.4.4-camlp5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml remind ncurses-devel
-# can be removed when F7 is EOL
-BuildRequires:  camlp4
 
-# Since F8 ocaml-camlp4-devel instead of camlp4 is needed
-%if 0%{?fedora} >= 8
-BuildRequires:  ocaml-camlp4-devel
-%endif
+BuildRequires:  ocaml-camlp5-devel
 
 %description
 wyrd is a ncurses frontend for the calendar application remind.
@@ -26,7 +22,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .wyrdrc-local
+%patch1 -p1 -b .camlp5
 
 
 %build
@@ -56,6 +53,9 @@
 
 
 %changelog
+* Tue Jul 08 2008 Till Maas <opensource at till.name> - 1.4.4-2
+- fix BuildRequires, the ocaml-camlp4-devel seems to have vanished
+
 * Fri Feb 22 2008 Till Maas <opensource till name> - 1.4.4-1
 - update to latest version that fixes CVE-2008-0806 in a different way
 - update URL/SOURCE to new location