Sun Mar 27 12:08:40 UTC 2005

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693

Modified Files:
	.cvsignore apt.spec mirror-select.conf sources 
Added Files:
	apt-pymake.patch apt-scriptdir.patch rpmpriorities 
Removed Files:
	apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua 
	rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Log Message:
0.5.15cnc7, perms fix, cleanups, drop non-FC4 files and build hacks.

apt-pymake.patch:

--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile	(revision 373)
+++ python/Makefile	(working copy)
@@ -16,10 +16,10 @@
 $(MODULES): %.py: _%.so
 
 _%.so: %_wrap.cxx
-	$(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+	$(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
 
 apt_wrap.cxx: apt.i
-	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+	$(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
 
 clean:
 	rm -f *.cxx

apt-scriptdir.patch:

--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 373)
+++ contrib/apt-wrapper/apt.1.xml	(working copy)
@@ -325,7 +325,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-     <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+     <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
      <listitem><para>APT lua scripts.
      Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
      </varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1	(revision 373)
+++ contrib/apt-wrapper/apt.1	(working copy)
@@ -157,7 +157,7 @@
 .SH "FILES"
 
 .TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
 APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
 
 .SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README	(revision 373)
+++ contrib/apt-files/README	(working copy)
@@ -40,7 +40,7 @@
 these files in the following directories:
 
     /etc/apt/apt.conf.d/apt-files.conf
-    /usr/lib/apt/scripts/apt-files.lua
+    /usr/share/apt/scripts/apt-files.lua
     /var/state/apt/Contents.gz
 
 Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf	(revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf	(working copy)
@@ -10,7 +10,7 @@
 // For RHEL/FC systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc	(revision 373)
+++ apt-pkg/luaiface.cc	(working copy)
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities	27 Mar 2005 12:08:38 -0000	1.3
@@ -0,0 +1,36 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:04:37 -0000	1.3
+++ .cvsignore	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apt.spec	19 Mar 2005 11:18:26 -0000	1.12
+++ apt.spec	27 Mar 2005 12:08:38 -0000	1.13
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define scriptdir %{_datadir}/apt/scripts/
@@ -8,23 +5,17 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 2
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
 ExcludeArch: x86_64 ppc64
 
 # unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 # user editable template configs
@@ -34,10 +25,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
 Source19: comps2prio.xsl
 
 # nightly updater scripts & config
@@ -78,44 +66,32 @@
 
 Provides: apt-mirrorselect
 
-# Others deps are automatically picked up by rpm
+# Other deps are automatically picked up by rpm
 Requires: gnupg, bzip2
 Requires(post): chkconfig, ldconfig
 Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
-
-%if "%{rpmver}" >= "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel
 
 # Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
 # Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+Patch7: apt-scriptdir.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -161,23 +137,29 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
 %patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
 
 # fix docs to reference correct paths
 perl -pi -e \
   's|\bconfigure-index\.gz\b|configure-index| ;
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/fr/apt.ent.fr
+  doc/apt.ent doc/*/apt.ent.*
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
+# don't require python, lua etc because of stuff in doc/contrib
+find contrib/ -type f | xargs chmod 0644
+
+# appease aclocal >= 1.8
+perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
+
+# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
+libtoolize -f && autoreconf
+
 
 %build
 %configure --disable-dependency-tracking
@@ -185,17 +167,12 @@
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
 make %{?_smp_mflags}
 
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
 %{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
 
+cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
 %{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
 %endif
 
 
@@ -226,8 +203,6 @@
 for cnf in %{SOURCE150} %{SOURCE151}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -259,14 +234,11 @@
 
 # apt-groupinstall from contrib
 install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
 
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -287,7 +259,8 @@
 %post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
- echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+  > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -326,6 +299,7 @@
 %{_bindir}/apt-config
 %{_bindir}/apt-shell
 %{_bindir}/apt-get
+%{_bindir}/countpkglist
 %{_bindir}/genpkglist
 %{_bindir}/gensrclist
 %{_bindir}/genbasedir
@@ -359,6 +333,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.5.15cnc7-2
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
 * Sat Mar 19 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi>
 - Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
 
@@ -401,7 +380,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide
+- add rpmpriorities file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -583,7 +562,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf
+- remove extraneous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
+++ mirror-select.conf	27 Mar 2005 12:08:38 -0000	1.4
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc4-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc4-mirrors.list";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:04:37 -0000	1.3
+++ sources	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af  apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de  apt-0.5.15cnc7.tar.bz2


--- apt-0.5.15cnc6-docbook.patch DELETED ---


--- apt-0.5.15cnc6-pymake.patch DELETED ---


--- apt-0.5.15cnc6-python-update.patch DELETED ---


--- apt-0.5.15cnc6-r362.patch DELETED ---


--- apt-0.5.15cnc6-scriptdir.patch DELETED ---


--- gpg-checker.lua DELETED ---


--- gpg-import.lua DELETED ---


--- rpmpriorities.1 DELETED ---


--- rpmpriorities.2 DELETED ---


--- rpmpriorities.3 DELETED ---


--- rpmpriorities.Rawhide DELETED ---


