commit 8cc4d6d4f73572a37814f849f88a489c596bd081
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Jan 31 09:54:26 2015 +0100
- updated to 0.5.1
- updated shared patch (shared lib is now upstream, now it renames
libmimedir to libmimedir-vlm and adds DESTDIR support)
libmimedir-vlm-shared.patch | 58 +++++++++++++++++++--------------------------
libmimedir-vlm.spec | 9 ++++---
2 files changed, 28 insertions(+), 39 deletions(-)
---
diff --git a/libmimedir-vlm.spec b/libmimedir-vlm.spec
index 4d1185c..4c06244 100644
--- a/libmimedir-vlm.spec
+++ b/libmimedir-vlm.spec
@@ -3,17 +3,16 @@
Summary: RFC 2425 implementation
Summary(pl.UTF-8): Implementacja RFC 2425
Name: libmimedir-vlm
-Version: 0.4
-Release: 4
+Version: 0.5.1
+Release: 1
License: BSD
Group: Libraries
-Source0: http://dl.sourceforge.net/synce/libmimedir-%{version}.tar.gz
-# Source0-md5: 156e1eb69377d9ae9180a09e38148ec6
+Source0:
http://downloads.sourceforge.net/libmimedir/libmimedir-%{version}.tar.gz
+# Source0-md5: 6e4df3be7f637496ffb1707589b3e4d2
Patch0: %{name}-shared.patch
URL: http://libmimedir.sourceforge.net/
BuildRequires: bison
BuildRequires: flex
-BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
diff --git a/libmimedir-vlm-shared.patch b/libmimedir-vlm-shared.patch
index f04a283..7856173 100644
--- a/libmimedir-vlm-shared.patch
+++ b/libmimedir-vlm-shared.patch
@@ -1,57 +1,47 @@
---- libmimedir-0.4/Makefile.in.orig 2005-03-04 07:35:50.000000000 +0100
-+++ libmimedir-0.4/Makefile.in 2005-10-25 18:18:40.270936344 +0200
-@@ -12,21 +12,20 @@
- YACC= @YACC@
- LEX= @LEX@
+--- libmimedir-0.5.1/Makefile.in.orig 2015-01-31 09:06:10.851265831 +0100
++++ libmimedir-0.5.1/Makefile.in 2015-01-31 09:49:19.547823861 +0100
+@@ -15,23 +15,23 @@
INSTALL= @INSTALL@
--RANLIB= @RANLIB@
--LIBS= -L. -lmimedir
-+LIBTOOL=libtool
+ RANLIB= @RANLIB@
+ LIBTOOL= @LIBTOOL@
+-LIBS= -L. libmimedir.la
+LIBS= libmimedir-vlm.la
--OBJS= dirlex.o dirsynt.o parse.o get.o dup.o free.o memmem.o add.o count.o
del.o
-+OBJS= dirlex.lo dirsynt.lo parse.lo get.lo dup.lo free.lo memmem.lo add.lo
count.lo del.lo
+ OBJS= dirlex.o dirsynt.o parse.o get.o dup.o free.o memmem.o add.o count.o
del.o
+ LOBJS= dirlex.lo dirsynt.lo parse.lo get.lo dup.lo free.lo memmem.lo add.lo
count.lo del.lo
TESTS = test
--all: libmimedir.a $(TESTS)
+-all: libmimedir.a libmimedir.la $(TESTS)
+all: libmimedir-vlm.la $(TESTS)
-libmimedir.a: ${OBJS}
- ar rc libmimedir.a ${OBJS}
- $(RANLIB) libmimedir.a
-+libmimedir-vlm.la: ${OBJS}
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libmimedir-vlm.la $(OBJS)
-rpath $(libdir)
++libmimedir-vlm.a: ${OBJS}
++ ar rc libmimedir-vlm.a ${OBJS}
++ $(RANLIB) libmimedir-vlm.a
--test: test.o libmimedir.a
-- ${CC} ${CFLAGS} -o test test.o ${LIBS}
+-libmimedir.la: ${LOBJS}
+- $(LIBTOOL) --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -rpath ${libdir} -o
libmimedir.la ${LOBJS}
++libmimedir-vlm.la: ${LOBJS}
++ $(LIBTOOL) --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -rpath ${libdir} -o
libmimedir-vlm.la ${LOBJS}
+
+-test: test.o libmimedir.la
+test: test.o libmimedir-vlm.la
-+ $(LIBTOOL) --mode=link ${CC} ${CFLAGS} -o test test.o ${LIBS}
+ $(LIBTOOL) --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -o test test.o ${LIBS}
dirsynt.c dirsynt.h: dirsynt.y
- ${YACC} -p_mdir_ -d dirsynt.y
-@@ -37,17 +36,21 @@
- ${LEX} -Cem -odirlex.c -P_mdir_ dirlex.l
-
- .SUFFIXES:
--.SUFFIXES: .c .o
-+.SUFFIXES: .c .o .lo
-
- .c.o:
- ${CC} ${CFLAGS} -o $@ -c $<
-
-+.c.lo:
-+ $(LIBTOOL) --mode=compile ${CC} ${CFLAGS} -o $@ -c $<
-+
- check: all
+@@ -55,9 +55,9 @@
./test
install: all
- ${INSTALL} -m 444 libmimedir.h ${includedir}
- ${INSTALL} -m 444 libmimedir.a ${libdir}
+- $(LIBTOOL) --mode=install ${INSTALL} -c -m 444 libmimedir.la
${libdir}/libmimedir.la
+ $(INSTALL) -d $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)
-+ ${INSTALL} -m 444 libmimedir.h ${DESTDIR}/${includedir}
-+ $(LIBTOOL) --mode=install ${INSTALL} libmimedir-vlm.la
${DESTDIR}/${libdir}
++ ${INSTALL} libmimedir.h $(DESTDIR)${includedir}
++ $(LIBTOOL) --mode=install ${INSTALL} -c libmimedir-vlm.la
$(DESTDIR)${libdir}/libmimedir-vlm.la
clean:
- rm -f *.o *.a *.core
+ rm -f $(OBJS) $(LOBJS) test.o *.a *.la *.core
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmimedir-vlm.git/commitdiff/8cc4d6d4f73572a37814f849f88a489c596bd081
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
