list files changes for gtk2 (is that really optimal to have utf8.pm and utf8_heavy.pl?)

2 files changed, 21 insertions, 11 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index e5f04c445..c885d928e 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -83,9 +83,11 @@ get_needed_files: $(DIRS) $(MOFILES)
 #	export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null
 	eval `perl -V:version`; \
 	cat share/list `../tools/specific_arch share/list` | \
-	perl -pe "s/ARCH/$(ARCH)/g ; s/PERL_VERSION/$$version/g ; s|/LIB/|/$(LIB)/|g" > /tmp/list
+	perl -pe "s/ARCH/$(ARCH)/g ; s/PERL_VERSION/$$version/g ; s|/LIB/|/$(LIB)/|g " | \
+	perl -pe 'if (/\*/) { @l = glob; @l == 1 and $$_ = "$$l[0]\n" } ' > /tmp/list
+	rpm -ql perl-GTK2 | grep '^/usr/lib' >> /tmp/list
 
-	@missing=`perl -lne 'print if !-e $$_' /tmp/list`; [ -z "$$missing" ] || { echo "missing files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; }
+	@missing=`perl -lne 'print if !-e $$_' /tmp/list`; [ -z "$$missing" ] || { echo "missing or multiple files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing or multiple files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; }
 
 	find auto -follow -name "*.so" >> /tmp/list
 
@@ -140,7 +142,7 @@ endif
 	      fi; \
 	    fi; \
 	done
-	mv -f $(DEST)/$(LIB)/libimlib-png.so $(DEST)/usr/$(LIB)
+	perl -pi -e 's/\s*use\s+(warnings|diagnostics|vars|strict).*//g' $(DEST)/usr/*/*/*/utf8_heavy.pl
 
 	mv -f $(DEST)/bin/* $(DEST)/sbin/* $(DEST)/usr/bin
 	cd $(DEST)/usr/bin ; mv insmod insmod_
diff --git a/perl-install/share/list b/perl-install/share/list
index b3f2b92ad..547db5994 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -49,9 +49,17 @@
 /usr/LIB/gconv/GEORGIAN-PS.so
 /usr/LIB/gconv/EUC-CN.so
 /usr/LIB/gconv/gconv-modules
-/usr/LIB/gtk/themes/engines/libpixmap.so
-/usr/LIB/gtk/themes/engines/libpixmap.la
-/usr/LIB/libimlib-png.so
+/usr/LIB/gtk-2.0/*/engines/libpixmap.so
+/usr/LIB/gtk-2.0/*/engines/libpixmap.la
+
+/etc/gtk-2.0/gdk-pixbuf.loaders
+/usr/LIB/gtk-2.0/*/loaders/libpixbufloader-xpm.so
+/usr/LIB/gtk-2.0/*/loaders/libpixbufloader-png.so
+/etc/gtk-2.0/gtk.immodules
+/etc/pango/pango.modules
+/usr/LIB/pango/*/modules/pango-basic-xft.so
+/usr/LIB/pango/*/modules/pango-basic-x.so
+
 /usr/lib/perl5/PERL_VERSION/AutoLoader.pm
 /usr/lib/perl5/PERL_VERSION/Carp.pm
 /usr/lib/perl5/PERL_VERSION/Carp/Heavy.pm
@@ -64,6 +72,11 @@
 /usr/lib/perl5/PERL_VERSION/Time/Local.pm
 /usr/lib/perl5/PERL_VERSION/IO/Socket/INET.pm
 /usr/lib/perl5/PERL_VERSION/IO/Socket/UNIX.pm
+/usr/lib/perl5/PERL_VERSION/base.pm
+/usr/lib/perl5/PERL_VERSION/constant.pm
+/usr/lib/perl5/PERL_VERSION/utf8.pm
+/usr/lib/perl5/PERL_VERSION/utf8_heavy.pl
+/usr/lib/perl5/PERL_VERSION/unicore/Exact.pl
 /usr/lib/perl5/PERL_VERSION/dumpvar.pl
 /usr/lib/perl5/PERL_VERSION/warnings.pm
 /usr/lib/perl5/PERL_VERSION/warnings/register.pm
@@ -118,11 +131,6 @@
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/URPM.pm
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/URPM/Resolve.pm
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/auto/URPM/URPM.so
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/Gtk.pm
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/Gtk/Types.pm
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/Gtk/Gdk/ImlibImage.pm
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/auto/Gtk/Gtk.so
-/usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux-thread-multi/auto/Gtk/Gdk/ImlibImage/ImlibImage.so
 /usr/LIB/rpm/rpmrc
 /usr/LIB/rpm/macros
 /sbin/rescuept