rpms/lrmi/devel lrmi-0.9-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lrmi.spec, 1.5, 1.6 sources, 1.2, 1.3 lrmi-0.8-soname.patch, 1.1, NONE lrmi-kudzu.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/lrmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8946

Modified Files:
	.cvsignore lrmi.spec sources 
Added Files:
	lrmi-0.9-build.patch 
Removed Files:
	lrmi-0.8-soname.patch lrmi-kudzu.patch 
Log Message:
* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
- 0.9, patches mostly applied/obsoleted upstream.
- Don't ship static libraries.


lrmi-0.9-build.patch:

--- NEW FILE lrmi-0.9-build.patch ---
--- Makefile~	2005-09-01 09:49:18.000000000 +0300
+++ Makefile	2005-11-09 09:40:30.000000000 +0200
@@ -30,17 +30,17 @@
 	ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR)
 	ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
 
-vbetest: vbetest.c liblrmi.a
+vbetest: vbetest.c liblrmi.so
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
 
 install:
 	mkdir -p $(LIBDIR)
-	install -m 755 -s -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION)
+	install -m 755 -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION)
 	rm -f $(LIBDIR)/$(LIBNAME).so
 	ln -sf $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(MAJOR)
 	ln -sf $(LIBNAME).so.$(MAJOR) $(LIBDIR)/$(LIBNAME).so
-	install -m 644 -s -p lrmi.h $(INCDIR)/lrmi.h
-	ldconfig
+	mkdir -p $(INCDIR)
+	install -m 644 -p lrmi.h vbe.h $(INCDIR)
 
 .PHONY: clean
 clean:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:49:46 -0000	1.2
+++ .cvsignore	10 Nov 2005 17:57:01 -0000	1.3
@@ -1 +1 @@
-lrmi-0.8.tar.gz
+lrmi-0.9.tar.gz


Index: lrmi.spec
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lrmi.spec	6 Apr 2005 22:12:23 -0000	1.5
+++ lrmi.spec	10 Nov 2005 17:57:01 -0000	1.6
@@ -1,17 +1,13 @@
 Name:           lrmi
-Version:        0.8
-Release:        2
-
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://sourceforge.net/projects/lrmi/
-Source0:        http://download.sourceforge.net/lrmi/lrmi-0.8.tar.gz
-# http://sf.net/tracker/index.php?func=detail&aid=872235&group_id=10747&atid=310747
-Patch0:         %{name}-0.8-soname.patch
-# From kudzu-1.1.73-1
-Patch1:         %{name}-kudzu.patch
+Source0:        http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.9-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -39,21 +35,17 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" liblrmi.so vbetest
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}
-install -pm 644 liblrmi.a $RPM_BUILD_ROOT%{_libdir}
-cp -dp liblrmi.so* $RPM_BUILD_ROOT%{_libdir}
-install -dm 755 $RPM_BUILD_ROOT%{_includedir}
-install -pm 644 lrmi.h vbe.h $RPM_BUILD_ROOT%{_includedir}
+make install \
+  LIBDIR=$RPM_BUILD_ROOT%{_libdir} INCDIR=$RPM_BUILD_ROOT%{_includedir}
 install -Dpm 755 vbetest $RPM_BUILD_ROOT%{_sbindir}/vbetest
 
 
@@ -62,19 +54,20 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
+%doc README
 %{_libdir}/liblrmi.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/liblrmi.a
-%{_libdir}/liblrmi.so
 %{_includedir}/lrmi.h
 %{_includedir}/vbe.h
+%{_libdir}/liblrmi.so
 
 %files -n vbetest
 %defattr(-,root,root,-)
@@ -82,7 +75,11 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
+- 0.9, patches mostly applied/obsoleted upstream.
+- Don't ship static libraries.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8-2
 - rebuilt
 
 * Fri Jul 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:49:46 -0000	1.2
+++ sources	10 Nov 2005 17:57:01 -0000	1.3
@@ -1 +1 @@
-424a451b9a499061c961d2f4ed482a4d  lrmi-0.8.tar.gz
+00c2d0e4f4848100c04d8f88591cb943  lrmi-0.9.tar.gz


--- lrmi-0.8-soname.patch DELETED ---


--- lrmi-kudzu.patch DELETED ---