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 (symlink)
index 0000000..8047841
--- /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 941f8df875a9934c28d41af97018540387177be1..61634a7c859108cc7688d81002621088773ccf97 100644 (file)
--- 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
 
        /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
 
 # This update need a reboot...
 #touch /var/run/need_reboot
 

diff --git a/lfs/perl-PDF-API2 b/lfs/perl-PDF-API2
index 81e9016c5097132cc60029fdfe7dc82d0086262b..a47a07681cfe2b98e40858c093b14ad599bfd62e 100644 (file)
--- 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)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

+

 TARGET     = $(DIR_INFO)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

-PROG       = perl-PDF-API2
-PAK_VER    = 2

 
 ###############################################################################
 # Top-level Rules
 
 ###############################################################################
 # Top-level Rules


@@ -52,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
 
 md5 : $(subst %,%_MD5,$(objects))
 

-dist: 
-       @$(PAK)
-

 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################

diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index ff78d366031a820f11d5f829f5cbac17e25b2dd6..9bc75f0f1facc9fb41c03b1dfc559fd43e0f2b87 100644 (file)
--- 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
 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
 
 ###############################################################################
 # Top-level Rules