[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ocaml-calendar/devel ocaml-calendar-2.01.1-META.patch, NONE, 1.1 ocaml-calendar.spec, 1.16, 1.17



Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18338

Modified Files:
	ocaml-calendar.spec 
Added Files:
	ocaml-calendar-2.01.1-META.patch 
Log Message:
Patch META file so it doesn't include the library twice.

ocaml-calendar-2.01.1-META.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ocaml-calendar-2.01.1-META.patch ---
--- calendar-2.01.1/Makefile.in.orig	2009-10-08 14:28:50.633555407 +0100
+++ calendar-2.01.1/Makefile.in	2009-10-08 14:29:07.767560374 +0100
@@ -114,8 +114,8 @@
 META: Makefile
 	echo "description = \"$(NAME) library\"" > $@
 	echo "version = \"$(VERSION)\"" >> $@
-	echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@
-	echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@
+	echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@
+	echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@
 	echo "requires = \"unix str\"" >> $@
 
 # Generic rules


Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-calendar.spec	8 Oct 2009 11:58:23 -0000	1.16
+++ ocaml-calendar.spec	8 Oct 2009 13:31:16 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           ocaml-calendar
 Version:        2.01.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -17,6 +17,8 @@ BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
+Patch0:         ocaml-calendar-2.01.1-META.patch
+
 # Ignore all generated modules *except* CalendarLib, since everything
 # now appears in that namespace.
 %define _use_internal_dependency_generator 0
@@ -40,6 +42,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n calendar-%{version}
+%patch0 -p1
 
 
 %build
@@ -83,8 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct  8 2009 Richard W.M. Jones <rjones redhat com> - 2.01.1-1
+* Thu Oct  8 2009 Richard W.M. Jones <rjones redhat com> - 2.01.1-2
 - New upstream release 2.01.1.
+- Patch META file so it doesn't include the library twice.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng lists fedoraproject org> - 2.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]