From 19e7bd5e57fecb44a0d7cb7e8b824b4747fe26c4 Mon Sep 17 00:00:00 2001 From: lace <> Date: Mon, 26 Dec 2005 09:30:48 +0000 Subject: [PATCH] Provide yum(8) repository configuration. - Disabled for now, though. --- Makefile.am | 2 +- build-static | 2 ++ captive.spec.in | 4 ++++ configure.ac | 10 ++++++++++ yum.repos.d/Makefile.am | 29 +++++++++++++++++++++++++++++ yum.repos.d/captive.repo | 24 ++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 yum.repos.d/Makefile.am create mode 100644 yum.repos.d/captive.repo diff --git a/Makefile.am b/Makefile.am index 9617e7f..ee1f71f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/Makefile-head.am AUTOMAKE_OPTIONS=gnu ACLOCAL_AMFLAGS=-I macros -SUBDIRS=macros src doc fonts po +SUBDIRS=macros src doc fonts yum.repos.d po ## to automatically rebuild aclocal.m4 if any of the macros in ## `macros/' change @MAINT@include macros/macros.dep diff --git a/build-static b/build-static index 523bab7..b2c905c 100755 --- a/build-static +++ b/build-static @@ -35,7 +35,9 @@ if test "$1" != link;then (set -x;CFLAGS="-O2" ./configure --enable-maintainer-mode --disable-shared --enable-static --enable-install-pkg \ --enable-standalone \ --enable-standalone-fonts=/usr/local/share/captive/fonts \ + --disable-standalone-yum \ ) 2>&1|tee errs1 +# --enable-standalone-yum=/etc/yum.repos.d make clean make 2>&1|tee errs2 set +x diff --git a/captive.spec.in b/captive.spec.in index 5398db1..fc01561 100644 --- a/captive.spec.in +++ b/captive.spec.in @@ -174,6 +174,7 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME --disable-standalone \ --disable-standalone-fonts \ %endif + --disable-standalone-yum \ --with-readline \ --disable-bug-replay \ --disable-lufs \ @@ -189,6 +190,8 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME --disable-gtk-doc \ --with-orbit-line=link +# --enable-standalone-yum=%{_sysconfdir}/yum.repos.d + make %if %{static} ./build-static link @@ -277,6 +280,7 @@ fi %attr(4755,root,root) %{_libexecdir}/@PACKAGE@-sandbox-server %attr(644,root,root) %{_mandir}/man?/@PACKAGE@-sandbox-server.* %config %{_sysconfdir}/gnome-vfs-2.0/modules/@PACKAGE@.conf +# %config %{_sysconfdir}/yum.repos.d/* %{_datadir}/locale/*/LC_MESSAGES/@PACKAGE@.mo %{_var}/lib/@PACKAGE@ diff --git a/configure.ac b/configure.ac index 69df721..16542c6 100644 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,8 @@ AC_ARG_ENABLE(standalone, [ --enable-standalone=no/yes provide initialization for static-build (def.=no)],,enable_standalone=no) AC_ARG_ENABLE(standalone-fonts, [ --enable-standalone-fonts=DIR provide bundled Gnome fonts in directory (def.=no)],,enable_standalone_fonts=no) +AC_ARG_ENABLE(standalone-yum, + [ --enable-standalone-yum=DIR provide bundled yum(8) packaging configuration directory (def.=no)],,enable_standalone_yum=no) # AC_ARG_ENABLE(sbin-mountdir,[--enable-sbin-mountdir=DIR],,[enable_sbin_mountdir="/sbin"]) @@ -468,6 +470,13 @@ if test x$have_gnome != xtrue -a x$have_gnome != xfalse;then fi AM_CONDITIONAL(HAVE_GNOME,[test "$have_gnome" = "true"]) +yum_repos_ddir= +if test x$enable_standalone_yum != xno;then + yum_repos_ddir="$enable_standalone_yum" +fi +AC_SUBST(yum_repos_ddir) +AM_CONDITIONAL(ENABLE_STANDALONE_YUM_REPOS_D,[test "$enable_standalone_yum" != "no"]) + AC_SUBST(CFLAGS) AC_SUBST(LIBS) @@ -556,6 +565,7 @@ Makefile ./doc/apiref/Makefile ./fonts/Makefile ./fonts/fonts.conf +./yum.repos.d/Makefile ]) dnl FIXME: Why is "po/POTFILES" being substituted? diff --git a/yum.repos.d/Makefile.am b/yum.repos.d/Makefile.am new file mode 100644 index 0000000..da0467e --- /dev/null +++ b/yum.repos.d/Makefile.am @@ -0,0 +1,29 @@ +# $Id$ +# automake source for Captive bundled yum.repos.d Makefile +# Copyright (C) 2005 Jan Kratochvil +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; exactly version 2 of June 1991 is required +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +include $(top_srcdir)/Makefile-head.am + +if ENABLE_STANDALONE_YUM_REPOS_D +yum_repos_d_cond=captive.repo +endif + +yum_repos_d_DATA=$(yum_repos_d_cond) + +EXTRA_DIST+= \ + captive.repo + diff --git a/yum.repos.d/captive.repo b/yum.repos.d/captive.repo new file mode 100644 index 0000000..e5d1cb9 --- /dev/null +++ b/yum.repos.d/captive.repo @@ -0,0 +1,24 @@ +# $Id$ +# yum(1) repository configuration for: http://www.jankratochvil.net/project/captive/ +# Copyright (C) 2005 Jan Kratochvil +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; exactly version 2 of June 1991 is required +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +[captive] +name=Captive NTFS +baseurl=http://www.jankratochvil.net/project/captive/dist/ +enabled=1 +gpgcheck=0 +#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -- 1.8.3.1