diff --git a/srcpkgs/libapp/patches/fix_makefile.patch b/srcpkgs/libapp/patches/fix_makefile.patch deleted file mode 100644 index 8d045333c57..00000000000 --- a/srcpkgs/libapp/patches/fix_makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig 2013-02-11 15:06:43.831345892 +0100 -+++ Makefile 2013-02-11 15:07:53.196725322 +0100 -@@ -25,7 +25,7 @@ apptest.o: base.h apptest.c app.h list.h - list.o: base.h list.h list.c - - $(SONAME).$(VER): $(OBJS) -- $(CC) $(MY_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(SONAME) -shared -o $@ $(OBJS) -+ $(CC) $(MY_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(SONAME).0 -shared -o $@ $(OBJS) - - .c.o: - $(CC) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -@@ -44,8 +44,9 @@ clean: - - install: $(SONAME) libapp.pc - install -d '$(LIBDIR)' -- $(INSTALL_S) -t '$(LIBDIR)' $(SONAME).$(VER) -+ install -m 755 $(SONAME).$(VER) $(LIBDIR) - $(LN_SF) $(SONAME).$(VER) '$(LIBDIR)'/$(SONAME) -+ $(LN_SF) $(SONAME).$(VER) '$(LIBDIR)'/$(SONAME).0 - install -d '$(INCAPPDIR)' - install -m 644 -t '$(INCAPPDIR)' $(HEADERS) - install -d '$(PKGCONFIGDIR)' diff --git a/srcpkgs/libapp/template b/srcpkgs/libapp/template index 30971f13827..35fcf504527 100644 --- a/srcpkgs/libapp/template +++ b/srcpkgs/libapp/template @@ -1,33 +1,27 @@ # Template file for 'libapp' pkgname=libapp -version=20110513 -revision=3 +version=20140608 +revision=1 +build_style=gnu-makefile short_desc="Utilities for repetitive tasks in app development" -maintainer="pancake " +maintainer="Juan RP " license="LGPL-3" homepage="https://github.com/drotiro/libapp" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177 do_fetch() { git clone git://github.com/drotiro/libapp.git ${pkgname}-${version} - cd ${pkgname}-${version} - git reset --hard e91cd8d35f16f73a8f5fb067470024228c9cdabd } - -do_build() { - make ${makejobs} PREFIX=/usr -} - do_install() { - make install PREFIX=${DESTDIR}/usr + make PREFIX=${DESTDIR}/usr install } libapp-devel_package() { - depends="${sourcepkg}>=${version}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove usr/lib/*.a + vmove usr/lib/*.so } }