rpms/apt/FC-6 apt.spec,1.34,1.35 sources,1.13,1.14
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Thu Nov 23 16:46:18 UTC 2006
Author: athimm
Update of /cvs/extras/rpms/apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-6
Modified Files:
apt.spec sources
Log Message:
Try to fix #210833, some anti-aging make-up.
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/apt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apt.spec 16 Sep 2006 09:45:13 -0000 1.34
+++ apt.spec 23 Nov 2006 16:45:48 -0000 1.35
@@ -3,99 +3,102 @@
%define generate_rpmpriorities 0
%define comps %{_datadir}/comps/%{_build_arch}/comps.xml
-Summary: Debian's Advanced Packaging Tool with RPM support
-Name: apt
-Version: 0.5.15lorg3.2
-Release: 7%{?dist}
-Group: System Environment/Base
-URL: http://apt-rpm.org/
-License: GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
-#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
# user editable template configs
-Source1: apt.conf
-Source2: sources.list
-Source3: vendors.list
-Source4: apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
# rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities
-Source19: comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
# Sources 50-99 are for Lua-scripts not in contrib/
-Source51: upgradevirt.lua
+Source51: upgradevirt.lua
# 150-199 for apt.conf.d
# "factory defaults"
-Source150: default.conf
+Source150: default.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TODO: verify the required minimum Python version
-BuildRequires: python-devel >= 2.2
-BuildRequires: libxml2-devel
-BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires: zlib-devel
-BuildRequires: bzip2-devel
-BuildRequires: libstdc++-devel
-BuildRequires: gettext
-BuildRequires: docbook-utils
-BuildRequires: perl
-BuildRequires: readline-devel
-BuildRequires: ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
%if %{generate_rpmpriorities}
-BuildRequires: %{_bindir}/xsltproc
-BuildRequires: %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
%endif
# libxml2-devel, #183689
-BuildRequires: pkgconfig
-Requires: gnupg
-Requires: bzip2
-Requires: fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
Requires(post): chkconfig
Requires(post): ldconfig
Requires(preun): chkconfig
%if 0%{!?_with_groupinstall:1}
-Obsoletes: %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
%endif
-Requires: apt-config
+Requires: apt-config
%description
APT-RPM is a port of Debian's apt tools for RPM based distributions.
It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages. APT features complete installation
+install and upgrade packages. APT features complete installation
ordering, multiple source capability and several other useful
features.
-%package devel
-Summary: Development files and documentation for APT's libapt-pkg
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
-%description devel
+%description devel
This package contains development files for developing with APT's
libapt-pkg package manipulation library, modified for RPM.
-%package python
-Summary: Python bindings for libapt-pkg
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
-%description python
+%description python
The apt-python package contains a module which allows python programs
to access the APT library interface.
-%package groupinstall
-Summary: Additional commands to install and remove package groups
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
-Requires: rhpl
-Requires: comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
-%description groupinstall
+%description groupinstall
This package adds four new commands to apt for installing, removing
and viewing groups of packages:
apt-cache groupnames
@@ -110,19 +113,19 @@
%prep
%setup -q
+%patch0 -p1 -b .ppc
# 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/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+ s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/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
-
%build
%configure --disable-dependency-tracking --disable-static
@@ -130,81 +133,81 @@
make %{?_smp_mflags}
make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
cp -p %{SOURCE5} rpmpriorities
%if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
%endif
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
%find_lang %{name}
# The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
# The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
# install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
# GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
- $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
- $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
# Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
for script in %{SOURCE51} ; do
- install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
done
# The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
# Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
# GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
# apt-groupinstall from contrib
%if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
- $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
%endif
# nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
/sbin/ldconfig
@@ -212,8 +215,8 @@
%preun
if [ $1 -eq 0 ] ; then
- %{_initrddir}/apt stop &>/dev/null || :
- /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
fi
%postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
%changelog
+* Thu Nov 23 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
* Sat Sep 16 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3.2-7
- Un%%ghost pyo files.
@@ -301,7 +308,7 @@
* Thu May 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-2.1
- Remove bogus final s from default(s).conf (Ville).
-* Mon May 8 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-2
- Split off configuration files from apt.
* Tue Apr 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
* Mon Apr 10 2006 Ville Skyttä <ville.skytta at iki.fi>
- Remove mirror select remainders (thanks to Panu).
-* Sun Apr 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
- 0.5.15lorg3-rc1.
- Trim pre-2005 changelog entries.
@@ -322,7 +329,7 @@
- use /var/lib/apt instead of obsolete /var/state/apt
- support FC4 as well
-* Fri Apr 7 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
- 0.5.15lorg3-pre4.
* Fri Mar 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
- 0.5.15lorg3-pre2
- set distroverpkg to fedora-release
- add distro version and arch independent default source list entries for
- fedora core, extras + updates
+ fedora core, extras + updates
- remove old nasty fedora.us-time hacks from post scriptlets
* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
* Tue Apr 19 2005 Seth Vidal <skvidal at phy.duke.edu>
- tobuild test
-* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.15cnc7-3
- Include apt-pkg includedir in -devel package
* Sat Mar 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
- Add Extras GPG key (Panu), and add it to fedora-vendors.list.
- Drop not-installed Fedora Legacy key from SRPM.
- Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
- packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> - 0:0.5.15cnc6-15.r362
- ExcludeArch: ppc64
* Fri Jan 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-14.r362
- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
- apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
* Sun Jan 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-13.r362
- Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 22 Jun 2006 09:53:10 -0000 1.13
+++ sources 23 Nov 2006 16:45:48 -0000 1.14
@@ -1 +1,2 @@
ce05fcc7e0e614fa6e2175008945bb59 apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa apt-0.5.15lorg3.2-ppc.patch
More information about the fedora-extras-commits
mailing list