|
@@ -1,9 +1,9 @@
|
|
|
%define with_python 1
|
|
|
|
|
|
-%define build_vine5 0
|
|
|
+%define build_vine6 0
|
|
|
|
|
|
-%if "%{?_dist_release}" == "vl5"
|
|
|
-%define build_vine5 1
|
|
|
+%if "%{?_dist_release}" == "vl6"
|
|
|
+%define build_vine6 1
|
|
|
%endif
|
|
|
|
|
|
%define snapver git522
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
|
Name: apt
|
|
|
Version: 0.5.15lorg3.95
|
|
|
-Release: 18.%{snapver}%{?_dist_release}
|
|
|
+Release: 19.%{snapver}%{?_dist_release}
|
|
|
Summary: Advanced front-end for rpm (APT - Advanced Package Tool)
|
|
|
Summary(ja): RPM の高機能なフロントエンド (APT - アドバンスドパッケージツール)
|
|
|
Group: Applications/Administration
|
|
@@ -34,7 +34,10 @@ Source9: acquire-default.conf
|
|
|
Source10: sources.list-vine
|
|
|
Source20: preferences.vine
|
|
|
Source30: rpmpriorities.vineseed
|
|
|
-Source31: rpmpriorities.vine5
|
|
|
+Source31: rpmpriorities.vine6
|
|
|
+
|
|
|
+Source40: allow-duplicated.lua
|
|
|
+Source41: allow-duplicated.conf
|
|
|
|
|
|
Source50: remove-old-kernels.lua
|
|
|
Source51: remove-old-kernels.conf
|
|
@@ -50,6 +53,8 @@ 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
|
|
|
+# fix build with gcc 4.7
|
|
|
+Patch2: apt-0.5.15lorg3.95-gcc47.patch
|
|
|
|
|
|
# enhance the sorting by taking Obsoletes into account
|
|
|
Patch10: %{name}-0.3.19cnc53-stelian-apt-pkg-algorithms-scores.patch.bz2
|
|
@@ -79,6 +84,8 @@ Patch160: apt-0.5.15lorg3.93-ignore-scriptlets-failure.patch
|
|
|
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.git522-handle-requires-prepost.patch
|
|
|
+# add swig2 pregenerated files
|
|
|
+Patch200: apt-0.5.15lorg3.95.git522-swig2-pregenerated-files.patch
|
|
|
# fix python-apt
|
|
|
Patch201: apt-0.5.15lorg3.95-remove-obsolete-const-vars.patch
|
|
|
|
|
@@ -114,8 +121,10 @@ BuildRequires: lua-devel
|
|
|
%if %{with_python}
|
|
|
BuildRequires: python
|
|
|
BuildRequires: python-devel
|
|
|
+%if "%{?_dist_release}" >= "vl7"
|
|
|
BuildRequires: swig >= 2.0.4
|
|
|
%endif
|
|
|
+%endif
|
|
|
|
|
|
%description
|
|
|
A port of Debian's apt tools for RPM based distributions.
|
|
@@ -167,6 +176,7 @@ 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 .gcc47
|
|
|
|
|
|
%patch10 -p1
|
|
|
%patch11 -p1
|
|
@@ -182,19 +192,26 @@ This package contains the python binding for apt libraries.
|
|
|
%patch160 -p1
|
|
|
%patch170 -p1
|
|
|
%patch180 -p1
|
|
|
+%if "%{?_dist_release}" >= "vl7"
|
|
|
%patch201 -p1
|
|
|
+%else
|
|
|
+%patch200 -p1
|
|
|
+%endif
|
|
|
|
|
|
%patch210 -p1
|
|
|
|
|
|
%patch220 -p1
|
|
|
|
|
|
cp %{SOURCE100} po/ja.po
|
|
|
-%if %{build_vine5}
|
|
|
-cp %{SOURCE31} rpmpriorities
|
|
|
-%else
|
|
|
+%if "%{?_dist_release}" >= "vl7"
|
|
|
cp %{SOURCE30} rpmpriorities
|
|
|
+%else
|
|
|
+cp %{SOURCE31} rpmpriorities
|
|
|
%endif
|
|
|
|
|
|
+# update allow-duplicated.{lua,conf}
|
|
|
+cp -f %{SOURCE40} %{SOURCE41} contrib/allow-duplicated/
|
|
|
+
|
|
|
%build
|
|
|
autoreconf -f -i
|
|
|
%configure \
|
|
@@ -384,6 +401,10 @@ rm -rf %{buildroot}
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Oct 01 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-19.git522
|
|
|
+- fix allow-duplicated.{lua,conf}
|
|
|
+- modify spec file to support vine6 build
|
|
|
+
|
|
|
* Wed Feb 20 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-18.git522
|
|
|
- update ja.po (apply patch from okano-san)
|
|
|
- add /etc/apt/vendors.list.d
|
|
@@ -528,18 +549,18 @@ rm -rf %{buildroot}
|
|
|
- remove %{_var}/state/apt from %%files list (no longer supported)
|
|
|
- apply new versioning policy
|
|
|
|
|
|
-* Mon Sep 15 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.93-0vl2
|
|
|
+* Sat Sep 15 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.93-0vl2
|
|
|
- update ja.po
|
|
|
- add Patch900 to translate more messages
|
|
|
- add Patch1000 to ignore rpm scriptlet failure in apt-get transaction
|
|
|
|
|
|
-* Sun Sep 14 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.93-0vl1
|
|
|
+* Fri Sep 14 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.93-0vl1
|
|
|
- new upstream release
|
|
|
|
|
|
-* Sat Sep 13 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.2-0vl15
|
|
|
+* Thu Sep 13 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.2-0vl15
|
|
|
- rebuild with rpm-4.4.2.2
|
|
|
|
|
|
-* Tue Sep 02 2007 Takuya Kobayashi <ruby11@cocoa.ocn.ne.jp> 0.5.15lorg3.2-0vl14
|
|
|
+* Sun Sep 02 2007 Takuya Kobayashi <ruby11@cocoa.ocn.ne.jp> 0.5.15lorg3.2-0vl14
|
|
|
- add Japanese translation of man pages.
|
|
|
- add Source110
|
|
|
- update Patch15
|
|
@@ -891,11 +912,11 @@ rm -rf %{buildroot}
|
|
|
- merged with new upstream version 0.3.19cnc53-2cl
|
|
|
- update ja.po
|
|
|
|
|
|
-* Mon Nov 13 2001 Alfredo K. Kojima <kojima@conectiva.com.br>
|
|
|
+* Tue Nov 13 2001 Alfredo K. Kojima <kojima@conectiva.com.br>
|
|
|
+ apt-0.3.19cnc53-2cl
|
|
|
- fixed bug in mirror patch
|
|
|
|
|
|
-* Mon Nov 13 2001 Alfredo K. Kojima <kojima@conectiva.com.br>
|
|
|
+* Tue Nov 13 2001 Alfredo K. Kojima <kojima@conectiva.com.br>
|
|
|
+ apt-0.3.19cnc53-1cl
|
|
|
- released version 0.3.19cnc53
|
|
|
- added kernel-tape to default AllowedDupPkgs
|
|
@@ -1040,10 +1061,10 @@ rm -rf %{buildroot}
|
|
|
- replaced option RPM::AllowedDupPackages with RPM::AllowedDupPkgs
|
|
|
- added option RPM::HoldPkgs (closes: #3462)
|
|
|
|
|
|
-* Sat Jun 1 2001 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.19.cnc.43-2vl2
|
|
|
+* Fri Jun 1 2001 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.19.cnc.43-2vl2
|
|
|
- updated ja.po.
|
|
|
|
|
|
-* Sat Jun 1 2001 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.19.cnc.43-2vl1
|
|
|
+* Fri Jun 1 2001 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.19.cnc.43-2vl1
|
|
|
- merged with 0.3.19cnc43-2cl
|
|
|
|
|
|
* Mon May 21 2001 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.19.cnc.38-2vl7
|
|
@@ -1381,13 +1402,13 @@ rm -rf %{buildroot}
|
|
|
* Fri Sep 15 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- released version 0.3.19cnc4
|
|
|
|
|
|
-* Mon Sep 12 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Tue Sep 12 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- released version 0.3.19cnc3
|
|
|
|
|
|
-* Mon Sep 5 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Tue Sep 5 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- renamed package to apt, with version 0.3.19cncV
|
|
|
|
|
|
-* Mon Sep 5 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Tue Sep 5 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- 0.10
|
|
|
- added genpkglist and rapt-config
|
|
|
- program names changed back to apt-*
|
|
@@ -1404,19 +1425,19 @@ rm -rf %{buildroot}
|
|
|
* Fri Sep 1 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- fixed typo in sources.list
|
|
|
|
|
|
-* Tue Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Thu Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- version 0.6
|
|
|
|
|
|
-* Tue Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Thu Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- version 0.5
|
|
|
|
|
|
-* Tue Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Thu Aug 31 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- version 0.4
|
|
|
|
|
|
* Wed Aug 30 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- version 0.3
|
|
|
|
|
|
-* Thu Aug 28 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
+* Mon Aug 28 2000 Alfredo K. Kojima <kojima@conectiva.com>
|
|
|
- second try. new release with direct hdlist handling
|
|
|
|
|
|
* Thu Aug 10 2000 Alfredo K. Kojima <kojima@conectiva.com>
|