rpms/apt/devel .cvsignore, 1.18, 1.19 apt.spec, 1.58, 1.59 sources, 1.18, 1.19

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4629

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
- Update to upstream snapshot to get something remotely working...
- Link to external Lua to match what rpm uses (#470728)
- Support varying filenames in repomd (#469805)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Jan 2008 20:50:40 -0000	1.18
+++ .cvsignore	23 Dec 2008 07:49:52 -0000	1.19
@@ -1 +1 @@
-apt-0.5.15lorg3.94.tar.bz2
+apt-0.5.15lorg3.95.git416.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- apt.spec	16 Dec 2008 08:38:40 -0000	1.58
+++ apt.spec	23 Dec 2008 07:49:53 -0000	1.59
@@ -3,17 +3,21 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
+%define aptver 0.5.15lorg3.95
+%define snapver git416
+%define srcver %{aptver}.%{snapver}
+
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15lorg3.94
-Release: 6%{?dist}
+Version: %{aptver}
+Release: 0.%{snapver}.1%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
 License: GPLv2+ 
 
 #Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{srcver}.tar.bz2
 
 # user editable template configs
 Source1: apt.conf
@@ -36,12 +40,6 @@
 Patch0: apt-0.5.15lorg3.2-ppc.patch
 # band aid for mmap issues (#211254)
 Patch1: apt-0.5.15lorg3.x-cache-corruption.patch
-Patch2: apt-0.5.15lorg3.94-tool-headers.patch
-Patch3: apt-0.5.15lorg3.94-gcc43.patch
-# for rpm 4.6
-Patch4: apt-0.5.15lorg3.94-makebuild.patch
-# for lua 5.1
-Patch5: apt-0.5.15lorg3.94-extlua.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -64,9 +62,8 @@
 %endif
 # libxml2-devel, #183689
 BuildRequires: pkgconfig
-BuildRequires: lua-devel >= 5.1, lua-posix
+BuildRequires: lua-devel >= 5.1
 BuildRequires: autoconf, automake
-Requires: lua-posix
 Requires: gnupg
 Requires: bzip2
 Requires: fedora-release >= 4
@@ -126,13 +123,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{srcver}
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
-%patch2 -p1 -b .toolheader
-%patch3 -p1 -b .gcc43
-%patch4 -p1 -b .rpm46
-%patch5 -p1 -b .extlua
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
@@ -140,8 +133,8 @@
 find contrib/ -type f | xargs chmod 0644
 
 %build
-autoreconf
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-dependency-tracking --disable-static \
+	CPPFLAGS=-D_RPM_4_4_COMPAT
 
 make %{?_smp_mflags}
 
@@ -234,7 +227,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/
-%doc ChangeLog lua/COPYRIGHT
+%doc ChangeLog
 
 %dir %{_sysconfdir}/apt/
 %config(noreplace) %{_sysconfdir}/apt/apt.conf
@@ -299,6 +292,11 @@
 
 
 %changelog
+* Tue Dec 23 2008 Panu Matilainen <pmatilai at redhat.com> - 0.5.15lorg3.95-0.git416.1
+- Update to upstream snapshot to get something remotely working...
+- Link to external Lua to match what rpm uses (#470728)
+- Support varying filenames in repomd (#469805)
+
 * Mon Dec 15 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.5.15lorg3.94-6
 - Fix internal lua crash, link against system lua 5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Jan 2008 20:50:40 -0000	1.18
+++ sources	23 Dec 2008 07:49:53 -0000	1.19
@@ -1,3 +1,3 @@
 319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch
 6c2e9568a0c2bbe6b0bbd1aa0643a377  apt-0.5.15lorg3.x-cache-corruption.patch
-91075f1f0226eaf2dadc73cee00c3de1  apt-0.5.15lorg3.94.tar.bz2
+a9fe12089bedfbb37ef48552f23874a9  apt-0.5.15lorg3.95.git416.tar.bz2