From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Oct 2017 16:31:51 +0000 (+0100)
Subject: Make perl-PDF-API2 part of the base system
X-Git-Tag: v2.19-core115~20
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e3c3625c34f2ea370014b1a3798edd9909b03497

Make perl-PDF-API2 part of the base system

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/perl-PDF-API2 b/config/rootfiles/common/perl-PDF-API2
similarity index 100%
rename from config/rootfiles/packages/perl-PDF-API2
rename to config/rootfiles/common/perl-PDF-API2
diff --git a/config/rootfiles/core/115/filelists/perl-PDF-API2 b/config/rootfiles/core/115/filelists/perl-PDF-API2
new file mode 120000
index 0000000000..80478419ac
--- /dev/null
+++ b/config/rootfiles/core/115/filelists/perl-PDF-API2
@@ -0,0 +1 @@
+../../../common/perl-PDF-API2
\ No newline at end of file
diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index 941f8df875..61634a7c85 100644
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -75,6 +75,10 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec restart
 fi
 
+# Let pakfire forget the perl-PDF-API2 package
+rm -fv /opt/pakfire/db/rootfiles/perl-PDF-API2
+rm -fv /opt/pakfire/db/*/meta-perl-PDF-API2
+
 # This update need a reboot...
 #touch /var/run/need_reboot
 
diff --git a/lfs/perl-PDF-API2 b/lfs/perl-PDF-API2
index 81e9016c50..a47a07681c 100644
--- a/lfs/perl-PDF-API2
+++ b/lfs/perl-PDF-API2
@@ -30,9 +30,8 @@ THISAPP    = PDF-API2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = perl-PDF-API2
-PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -52,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index ff78d36603..9bc75f0f1f 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,9 +15,9 @@ THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
-PAK_VER    = 9
+PAK_VER    = 10
 
-DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2"
+DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards"
 
 ###############################################################################
 # Top-level Rules