From: root <jan.kratochvil@redhat.com>
Date: Sat, 3 Jan 2015 15:40:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=e36f4e85c46f2f9eedcfc9b64dded50171364c0f;hp=-c

Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
---

e36f4e85c46f2f9eedcfc9b64dded50171364c0f
diff --combined src/INSTALL
index 30f7da7,aeabe81..b538ddf
--- a/src/INSTALL
+++ b/src/INSTALL
@@@ -1,4 -1,4 +1,4 @@@
- cvs python openssh-clients subversion gnupg vim-enhanced procmail bind-utils git ctags quilt perl-IO-Tty wget mutt koji strace cvs2cl ltrace db4-utils hexedit cvsutils redhat-rpm-config libtool autogen rpcbind nfs-utils yum-utils yum-plugin-auto-update-debug-info man fakeroot mercurial dwdiff man-pages cscope rpmdevtools sudo perl-CPAN xz-devel fedora-packager ed help2man intltool gperf gnome-common gnome-doc-utils libmudflap
+ cvs python openssh-clients subversion gnupg vim-enhanced procmail bind-utils git ctags quilt perl-IO-Tty wget mutt koji strace cvs2cl ltrace db4-utils hexedit cvsutils redhat-rpm-config libtool autogen rpcbind nfs-utils yum-utils yum-plugin-auto-update-debug-info man fakeroot mercurial dwdiff man-pages cscope rpmdevtools sudo perl-CPAN xz-devel fedora-packager ed help2man intltool gperf gnome-common gnome-doc-utils libmudflap make
  ElectricFence
  	ElectricFence.i386
  	ElectricFence.i586
@@@ -32,10 -32,11 +32,10 @@@ sharutils dejagnu gcc-gfortran gcc-jav
  	libgnat.i386 glibc-devel.i386 libgcc.i386 libstdc++.i386 libgcj.i386 glibc-static.i386 zlib-devel.i386 valgrind.i386 
  	libgnat.i586 glibc-devel.i586 libgcc.i586 libstdc++.i586 libgcj.i586 glibc-static.i586 zlib-devel.i586 valgrind.i586
  	libgnat.i686 glibc-devel.i686 libgcc.i686 libstdc++.i686 libgcj.i686 glibc-static.i686 zlib-devel.i686 valgrind.i686 
 -elfutils-devel ppl-devel cloog-ppl-devel doxygen graphviz gmp-devel mpfr-devel gtk2-devel glib2-devel xulrunner-devel libart_lgpl-devel alsa-lib-devel libXtst-devel libXt-devel libmpc-devel
 +elfutils-devel ppl-devel cloog-ppl-devel doxygen graphviz gmp-devel mpfr-devel libmpc-devel
  expat-debuginfo glibc-debuginfo ncurses-debuginfo python-debuginfo zlib-debuginfo
  gd-devel audit-libs-devel libcap-devel
  zlib-static
 -desktop-file-utils fedora-bookmarks xulrunner-devel-unstable
  compat-libstdc++-33
  	compat-libstdc++-33.i386
  	compat-libstdc++-33.i586