From 0711347aaf41ad6bd0024a804aa38454eb9bfa00 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 22 Jan 2017 12:02:02 -0600
Subject: [PATCH] Split lib and dev packages

---
 Makefile            | 59 ++++++++++++++++++++++++++++++++-------------
 Makefile.libattr    | 15 ++++++++++++
 Makefile.libattrdev | 15 ++++++++++++
 3 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 Makefile.libattr
 create mode 100644 Makefile.libattrdev

diff --git a/Makefile b/Makefile
index c5bcb60..23f4571 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,25 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = 
-ARCH = x86_64
-URL = http://savannah.nongnu.org/projects/attr
+export SRCPKG = attr
+export DEPENDS = glibc,libattr
+export ARCH = x86_64
+export URL = http://savannah.nongnu.org/projects/attr
 BRIEF = Filesystem extended attributes utilities
 DESC = Commands for Manipulating Filesystem Extended Attributes
-SNAPVER = sr1
+SNAPVER = 2
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
+export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
+	sed 's/^-//')-$(SNAPVER)
+
+LIBATTR := $(PWD)/libattr
+export LIBATTRROOT := $(LIBATTR)/ROOT
+LIBATTRDEV := $(PWD)/libattr-dev
+export LIBATTRDEVROOT := $(LIBATTRDEV)/ROOT
 
 MAKE = make
 MAKEINST = make install install-dev install-lib
@@ -27,6 +34,18 @@ SNAPHACKS =
 
 include /usr/share/snap/Makefile.snaplinux
 
+$(LIBATTRROOT): $(ROOT)
+	@install -v -d $(LIBATTR)/SNAP && \
+	install -v -d $(LIBATTRROOT)
+	@cd $(SRCDIR) && make install-lib DESTDIR=$(LIBATTRROOT)
+	@cd $(LIBATTR) && make -f ../Makefile.libattr && mv *.snap ../
+
+$(LIBATTRDEVROOT): $(ROOT)
+	@install -v -d $(LIBATTRDEV)/SNAP && \
+	install -v -d $(LIBATTRDEVROOT)
+	@cd $(SRCDIR) && make install-dev DESTDIR=$(LIBATTRDEVROOT)
+	@cd $(LIBATTRDEV) && make -f ../Makefile.libattrdev && mv *.snap ../
+
 $(SRCDIR): $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
 		tar -jxf $(ARCHIVE); \
@@ -42,23 +61,21 @@ $(SRCDIR): $(ARCHIVE)
 	fi
 
 $(SRCDIR)/config.log: $(SRCDIR)
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
-		patch --verbose -Np0 -i $$patch; \
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
 	done
-	@cd $(SRCDIR); \
-	./configure \
+	@cd $(SRCDIR); ./configure \
 		--prefix=/usr \
 		--bindir=/bin \
 		--libdir=/lib \
 		--libexecdir=/usr/lib \
-		--disable-static \
 		--build=x86_64-snap-linux-gnu \
 		--host=x86_64-snap-linux-gnu \
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/attr: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/attr
 	@if [ -d $(ROOT) ]; then \
@@ -66,11 +83,17 @@ $(ROOT): $(SRCDIR)/attr
 	else \
 		mkdir -v $(ROOT); \
 	fi
-
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@install -v -d $(LIBATTR)/SNAP && \
+	install -v -d $(LIBATTRROOT) && \
+	install -v -d $(LIBATTRDEV)/SNAP && \
+	install -v -d $(LIBATTRDEVROOT) && \
+	cd $(SRCDIR) && make install-lib DESTDIR=$(LIBATTRROOT) && \
+	make install-dev DESTDIR=$(LIBATTRDEVROOT) && \
+	make install DESTDIR=$(ROOT) && \
+	gzip $(ROOT)/usr/share/doc/attr/COPYING* && \
+	gzip $(LIBATTRROOT)/usr/share/doc/attr/COPYING* && \
+	cd $(LIBATTR) && make -f ../Makefile.libattr && mv *.snap ../ && \
+	cd $(LIBATTRDEV) && make -f ../Makefile.libattrdev && mv *.snap ../
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
@@ -78,6 +101,8 @@ test: $(ROOT)
 
 clean:
 	@rm -rvf $(ROOT) \
+		$(LIBATTR) \
+		$(LIBATTRDEV) \
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
diff --git a/Makefile.libattr b/Makefile.libattr
new file mode 100644
index 0000000..6f27708
--- /dev/null
+++ b/Makefile.libattr
@@ -0,0 +1,15 @@
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as 
+# published by the Free Software Foundation here:
+# (http://www.gnu.org/licenses/gpl-2.0.html)
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+DEPENDS = glibc
+BRIEF = Access control list shared library
+DESC = Shared library for manipulating POSIX Access Control Lists
+
+include /usr/share/snap/Makefile.snaplinux
diff --git a/Makefile.libattrdev b/Makefile.libattrdev
new file mode 100644
index 0000000..8173e60
--- /dev/null
+++ b/Makefile.libattrdev
@@ -0,0 +1,15 @@
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as 
+# published by the Free Software Foundation here:
+# (http://www.gnu.org/licenses/gpl-2.0.html)
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+DEPENDS = glibc,libattr
+BRIEF = Access control list shared library
+DESC = Shared library for manipulating POSIX Access Control Lists
+
+include /usr/share/snap/Makefile.snaplinux