[CHRPM] ripole-0.1.4-6mdk

[Oden Eriksson]

-=-=-=-
Name        : ripole                       Relocations: (not relocatable)
Version     : 0.1.4                             Vendor: Mandriva
Release     : 6mdk                          Build Date: Fri Sep 16 11:52:28 2005
Install Date: (not installed)               Build Host: n5.mandriva.com
Group       : Networking/Mail               Source RPM: (none)
Size        : 27538                            License: BSD
Signature   : (none)
Packager    : Oden Eriksson <oeriksson@mandriva.com>
URL         : http://www.pldaniels.com/ripole/
Summary     : Extracts attachments out of mailpack format emails
Description :
ripOLE is a small program/library designed to pull out attachments
from OLE2 data files (ie, MS Office documents).  ripOLE is BSD
licenced meaning that commercial projects can also use the code
without worry of licence costs or legal liabilities.



-=-=-=-
Oden Eriksson <oeriksson@mandriva.com> 0.1.4-6mdk

- use libtool when making the lib and binary

-=-=-=-
No rpmlint error, happy (wo)man :-)

-=-=-=-
http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/SPECS/ripole/

ripole-0.1.4-shared.diff changed
ripole.spec changed
diff -u Makefile.oden Makefile.oden
--- Makefile.oden	2004-11-27 18:43:29.924503800 +0100
+++ Makefile.oden	2005-09-16 11:43:36.000000000 +0200
@@ -1,34 +1,47 @@
+CFLAGS=-Wall -g -O2 -I. -fPIC -DPIC -D_REENTRANT
 CC=gcc
-MAJOR=0
-MINOR=1
-MICRO=4
-
-OBJS= ole.o olestream-unwrap.o bytedecoders.o logger.o pldstr.o bt-int.o
-CFLAGS=-Wall -g -O2 -I.
-LIBS=
-
-.c.o:
-	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
-
-all: shared static ripole
- 
-shared: $(OBJS)
-	$(CC) $(CFLAGS) -Wl,-soname,libripole.so.$(MAJOR) -shared \
-	-o libripole.so.$(MAJOR).$(MINOR).$(MICRO) $(OBJS)
-	ln -snf libripole.so.$(MAJOR).$(MINOR).$(MICRO) libripole.so.$(MAJOR)
-	ln -snf libripole.so.$(MAJOR).$(MINOR).$(MICRO) libripole.so
- 
-static: $(OBJS)
-	ar ruvs libripole.a $(OBJS)
+bindir = /usr/bin
+libdir = /usr/lib
+includedir = /usr/include
+DESTDIR = 
+
+AR = ar
+RANLIB = ranlib
+LIBTOOL = libtool
+INSTALL = install -c
+LDFLAGS = 
+
+LT_CURRENT=1
+LT_REVISION=4
+LT_AGE=1
+
+OBJS=ole.o olestream-unwrap.o bytedecoders.o logger.o pldstr.o bt-int.o
+LTOBJS:= $(OBJS:.o=.lo)
+
+all: libripole.la ripole
+
+libripole.la: $(LTOBJS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o \
+	libripole.la $(LTOBJS)
+
+ripole: ripole.o libripole.la
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+%.lo: %.c
+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
+
+install:
+	$(INSTALL) -d $(DESTDIR)$(bindir)
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(INSTALL) -d $(DESTDIR)$(includedir)/ripole
+	$(LIBTOOL) --mode=install $(INSTALL) libripole.la $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 ripole $(DESTDIR)$(bindir)
+	$(INSTALL) -m 644 ole.h $(DESTDIR)$(includedir)/ripole
 
 clean:
-	rm -f *.o ripole
-
-ripole: $(OBJS) ripole.[ch]
-		$(CC) $(CFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
-
-ripole: $(OBJS) shared ripole.[ch]
-	$(CC) $(CFLAGS) $(COMPONENTS) ripole.c -L./ -lripole -o ripole $(LIBS)
-	
-validate: ripole
-		cp ripole validate
+	rm -f *.o *.lo *.a *.la ripole
+	rm -rf .libs
--- ripole-0.1.4-5mdk.src.rpm/ripole.spec	2005-09-30 20:11:43.085442473 +0200
+++ ripole-0.1.4-6mdk.src.rpm/ripole.spec	2005-09-30 20:11:43.165431837 +0200
@@ -1,25 +1,17 @@
-%define	name	ripole
-%define version 0.1.4
-%define release 5mdk
-
 %define	major 0
-%define	minor 1
-%define	micro 4
-%define libname	%mklibname %{name} %{major}
+%define libname	%mklibname ripole %{major}
 
 Summary:	Extracts attachments out of mailpack format emails
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		ripole
+Version:	0.1.4
+Release:	%mkrel 6
 License:	BSD
 Group:		Networking/Mail
 URL:		http://www.pldaniels.com/ripole/
 Source0:	http://www.pldaniels.com/ripole/%{name}-%{version}.tar.bz2
 Patch0:		ripole-0.1.4-shared.diff.bz2
 Patch1:		ripole-0.1.4-ripmime-1.4.0.5.diff.bz2
-BuildConflicts:	ripole-devel
-BuildConflicts:	%{libname}
-BuildRoot:	%{_tmppath}/%{name}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 ripOLE is a small program/library designed to pull out attachments
@@ -42,7 +34,7 @@
 Group:		Development/C
 Provides:	%{name}-devel
 Provides:	lib%{name}-devel
-Requires:	%{libname} = %{version}-%{release}
+Requires:	%{libname} = %{version}
 
 %description -n	%{libname}-devel
 ripOLE is a small program/library designed to pull out attachments
@@ -58,33 +50,15 @@
 
 %build
 
-make \
-    CFLAGS="%{optflags} -fPIC -D_REENTRANT -I." \
-    MAJOR="%{major}" \
-    MINOR="%{minor}" \
-    MICRO="%{micro}" \
-    shared static ripole
+%make libdir=%{_libdir}
 
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
-install -d %{buildroot}%{_bindir}
-install -d %{buildroot}%{_libdir}
-install -d %{buildroot}%{_includedir}/%{name}
-
-# install binaries
-install -m755 %{name} %{buildroot}%{_bindir}/
-
-# install the shared library
-install -m755 lib%{name}.so.%{major}.%{minor}.%{micro} %{buildroot}%{_libdir}/
-ln -snf lib%{name}.so.%{major}.%{minor}.%{micro} %{buildroot}%{_libdir}/lib%{name}.so
-ln -snf lib%{name}.so.%{major}.%{minor}.%{micro} %{buildroot}%{_libdir}/lib%{name}.so.%{major}
-
-# install the static library
-install -m755 lib%{name}.a %{buildroot}%{_libdir}/
-
-# install headers
-install -m0644 *.h %{buildroot}%{_includedir}/%{name}/
+%makeinstall_std \
+    bindir=%{_bindir} \
+    libdir=%{_libdir} \
+    includedir=%{_includedir}
 
 %post -n %{libname} -p /sbin/ldconfig
 
@@ -108,8 +82,12 @@
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/*.a
+%{_libdir}/*.la
 
 %changelog
+* Fri Sep 16 2005 Oden Eriksson <oeriksson@mandriva.com> 0.1.4-6mdk
+- use libtool when making the lib and binary
+
 * Sun Jun 12 2005 Oden Eriksson <oeriksson@mandriva.com> 0.1.4-5mdk
 - added P1 from ripmime-1.4.0.5
 


-- 
http://www.mandrivalinux.com/en/cookerdevel.php3