apt: update to upstream git snapshot, remove unneeded patches

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3750 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apt/apt-vl.spec

@@ -6,7 +6,7 @@
 %define build_vine5 1
 %endif
 
-%define snapver git416
+%define snapver git522
 %define srcver %{version}.%{snapver}
 
 Name: apt
@@ -15,7 +15,7 @@ Release: 8.%{snapver}%{?_dist_release}
 Summary: Advanced front-end for rpm (APT - Advanced Package Tool)
 Summary(ja): RPM の高機能なフロントエンド (APT - アドバンスドパッケージツール)
 Group: Applications/Administration
-License: GPL
+License: GPLv2+
 Url: http://apt-rpm.org/
 
 Vendor: Project Vine
@@ -49,13 +49,6 @@ Source110: apt-japanese-man-pages.tar.bz2
 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.95.git416-sqlite-bugfix.patch
-Patch3: apt-0.5.15lorg3.95.git416-mask-search.patch
-Patch4: apt-0.5.15lorg3.95.git416-replace-string.patch
-Patch5: apt-0.5.15lorg3.95.git416-sha256.patch
-Patch6: apt-0.5.15lorg3.95.git416-header-parsing.patch
-Patch7: apt-0.5.15lorg3.95.git416-cronjob.patch
-Patch8: apt-0.5.15lorg3.95.git416-distroverpkg.patch
 
 # enhance the sorting by taking Obsoletes into account
 Patch10:		%{name}-0.3.19cnc53-stelian-apt-pkg-algorithms-scores.patch.bz2
@@ -67,10 +60,6 @@ Patch12:		%{name}-0.5.4cnc9-alt-pkgorderlist_score.patch.bz2
 Patch13:	%{name}-0.5.4cnc9-alt-specialchars.patch.bz2
 # a quick bugfixe to make build-dep work
 Patch16:    %{name}-build-dep.patch.bz2
-# use find() instead of manual search for RPMHandler::HasFile()
-Patch20: apt-0.5.15lorg3.94a-use-find-for-rpmhandler-hasfile.patch
-# apt-shell: quit from shell by Ctrl+D
-Patch21: apt-0.5.15lorg3.94a-quit-from-shell-by-ctrl-d.patch
 
 # Vine patch
 # support "$(ARCH)" in sources.list
@@ -82,14 +71,18 @@ Patch130: apt-0.5.15lorg3.2-apt-cdrom-fstab-free.patch
 # select correct version of kernel on apt-get upgrade (allow-duplicated.lua)
 Patch140: apt-0.5.15lorg3.2-allow-duplicated_lua.patch
 # more gettextize
-Patch150: apt-0.5.15lorg3.94a-gettextize.patch
+Patch150: apt-0.5.15lorg3.95-git522-gettextize.patch
 # set RPM_IGNORE_SCRIPTLETS_FAILURE to ignore rpm scriptlets failure
 Patch160: apt-0.5.15lorg3.93-ignore-scriptlets-failure.patch
 # use lua-rex for rex
 Patch170: apt-0.5.15lorg3.95-lua-rex.patch
 # handle not only legacy PreReq but also Requires(pre,post) as PreDepends
-Patch180: apt-0.5.15lorg3.95.git416-handle-requires-prepost.patch
+Patch180: apt-0.5.15lorg3.95.git522-handle-requires-prepost.patch
+# add swig2 pregenerated files
+Patch200: apt-0.5.15lorg3.95.git522-swig2-pregenerated-files.patch
 
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): ldconfig, coreutils
 Requires(postun): ldconfig
 Requires(triggers): sed, coreutils
@@ -112,7 +105,6 @@ BuildRequires: lua-devel
 BuildRequires: python
 BuildRequires: python-devel
 %endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -164,21 +156,12 @@ This package contains the python binding for apt libraries.
 %setup -q -a 110 -n %{name}-%{srcver}
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
-%patch2 -p1 -b .sqlite-bugfix
-%patch3 -p1 -b .mask-search
-%patch4 -p1 -b .replace-string
-%patch5 -p1 -b .sha256
-%patch6 -p1 -b .header-parsing
-%patch7 -p1 -b .cronjob
-%patch8 -p1 -b .distroverpkg
 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch16 -p1
-%patch20 -p1
-%patch21 -p1
 
 %patch100 -p0
 %patch120 -p1
@@ -188,6 +171,7 @@ This package contains the python binding for apt libraries.
 %patch160 -p1
 %patch170 -p1
 %patch180 -p1
+%patch200 -p1
 
 cp %{SOURCE100} po/ja.po
 %if %{build_vine5}
@@ -381,6 +365,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun May 01 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-9.git522
+- update to upstream git snapshot
+  - drop upstreamed patches
+
 * Sat Mar 19 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-8.git416
 - drop vine4 support
 - add vine5 support