rpms/mdsplib/FC-6 mdsplib-0.11-makefile.patch, NONE, 1.1 mdsplib-0.11-shared.patch, NONE, 1.1 mdsplib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Matthias Saou (thias) fedora-extras-commits at redhat.com
Thu Jun 14 16:53:29 UTC 2007


Author: thias

Update of /cvs/extras/rpms/mdsplib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1254/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	mdsplib-0.11-makefile.patch mdsplib-0.11-shared.patch 
	mdsplib.spec 
Log Message:
Initial import.


mdsplib-0.11-makefile.patch:

--- NEW FILE mdsplib-0.11-makefile.patch ---
diff -Naupr mdsplib-0.11.orig/Makefile mdsplib-0.11/Makefile
--- mdsplib-0.11.orig/Makefile	2003-12-10 20:56:23.000000000 +0100
+++ mdsplib-0.11/Makefile	2007-03-01 14:55:05.000000000 +0100
@@ -1,6 +1,9 @@
 CC = gcc
-CFLAGS = -O3
 LIBS = 
+DESTDIR = 
+prefix = /usr
+libdir = $(prefix)/lib
+includedir = $(prefix)/include
 
 library: libmetar.a
 
@@ -44,9 +47,11 @@ clean:
 	rm -f src/*.o dmetar libmetar.a
 
 install: library
-	cp metar.h /usr/local/include/
-	chmod 0644 /usr/local/include/metar.h
-	cp libmetar.a /usr/local/lib/
-	chmod 0644 /usr/local/lib/libmetar.a
-	ranlib /usr/local/lib/libmetar.a
+	mkdir -p $(DESTDIR)$(includedir)
+	cp metar.h $(DESTDIR)$(includedir)/
+	chmod 0644 $(DESTDIR)$(includedir)/metar.h
+	mkdir -p $(DESTDIR)$(libdir)
+	cp libmetar.a $(DESTDIR)$(libdir)/
+	chmod 0644 $(DESTDIR)$(libdir)/libmetar.a
+	ranlib $(DESTDIR)$(libdir)/libmetar.a
 

mdsplib-0.11-shared.patch:

--- NEW FILE mdsplib-0.11-shared.patch ---
--- mdsplib-0.11/Makefile~	2007-06-08 11:31:18.000000000 +0200
+++ mdsplib-0.11/Makefile	2007-06-08 11:31:18.000000000 +0200
@@ -5,16 +5,15 @@
 libdir = $(prefix)/lib
 includedir = $(prefix)/include
 
-library: libmetar.a
+library: libmetar.so.0
 
 all: dmetar library
 
-libmetar.a: src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
-	ar ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
-	ranlib libmetar.a
+libmetar.so.0: src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
+	gcc -shared -o libmetar.so.0 -Wl,-soname,libmetar.so.0 src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
 
-dmetar: src/drvmetar.o libmetar.a
-	$(CC) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS)
+dmetar: src/drvmetar.o libmetar.so.0
+	$(CC) $(CFLAGS) -o dmetar src/drvmetar.o -L. -lmetar $(LIBS)
 
 src/antoi.o: src/antoi.c src/local.h
 	$(CC) $(CFLAGS) -c src/antoi.c -o src/antoi.o
@@ -44,14 +43,13 @@
 	$(CC) $(CFLAGS) -c src/stspack3.c -o src/stspack3.o
 
 clean:
-	rm -f src/*.o dmetar libmetar.a
+	rm -f src/*.o dmetar libmetar.so.0
 
 install: library
 	mkdir -p $(DESTDIR)$(includedir)
 	cp metar.h $(DESTDIR)$(includedir)/
 	chmod 0644 $(DESTDIR)$(includedir)/metar.h
 	mkdir -p $(DESTDIR)$(libdir)
-	cp libmetar.a $(DESTDIR)$(libdir)/
-	chmod 0644 $(DESTDIR)$(libdir)/libmetar.a
-	ranlib $(DESTDIR)$(libdir)/libmetar.a
-
+	cp libmetar.so.0 $(DESTDIR)$(libdir)/
+	chmod 0755 $(DESTDIR)$(libdir)/libmetar.so.0
+	ln -s libmetar.so.0 $(DESTDIR)$(libdir)/libmetar.so


--- NEW FILE mdsplib.spec ---
Summary: METAR Decoder Software Package Library
Name: mdsplib
Version: 0.11
Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
URL: http://limulus.net/mdsplib/
Source: http://limulus.net/mdsplib/mdsplib-%{version}.tar.gz
Patch0: mdsplib-0.11-makefile.patch
Patch1: mdsplib-0.11-shared.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
METAR is a French acronym for Aviation Routine Weather Report. It is the
standard format for reporting meteorological conditions. As a free service,
the National Weather Service continually updates a server with METARs from all
over the world.

The MDSP Library provides a programmer with two functions, the major one
being DcdMETAR, which decodes a METAR into structures provided by the
library. Also prtDMETR, which prints out a decoded METAR structure.


%package devel
Summary: Development files for the METAR Decoder Software Package Library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
METAR is a French acronym for Aviation Routine Weather Report. It is the
standard format for reporting meteorological conditions. As a free service,
the National Weather Service continually updates a server with METARs from all
over the world.

The MDSP Library provides a programmer with two functions, the major one
being DcdMETAR, which decodes a METAR into structures provided by the
library. Also prtDMETR, which prints out a decoded METAR structure.


%prep
%setup -q
%patch0 -p1 -b .makefile
%patch1 -p1 -b .shared


%build
%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -fpic"


%install
%{__rm} -rf %{buildroot}
%{__make} install libdir=%{_libdir} DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc HISTORY LICENSE README*
%{_libdir}/libmetar.so.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/metar.h
%{_libdir}/libmetar.so


%changelog
* Fri Jun  8 2007 Matthias Saou <http://freshrpms.net/> 0.11-3
- Include patch from Hans de Goede to build the lib as shared.

* Tue May  8 2007 Matthias Saou <http://freshrpms.net/> 0.11-2
- Switch to generating the devel package and no main one.

* Thu Mar  1 2007 Matthias Saou <http://freshrpms.net/> 0.11-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdsplib/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jun 2007 16:06:22 -0000	1.1
+++ .cvsignore	14 Jun 2007 16:52:54 -0000	1.2
@@ -0,0 +1 @@
+mdsplib-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdsplib/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jun 2007 16:06:22 -0000	1.1
+++ sources	14 Jun 2007 16:52:54 -0000	1.2
@@ -0,0 +1 @@
+c529c07675431f50c517921db6fdd122  mdsplib-0.11.tar.gz




More information about the fedora-extras-commits mailing list