rpms/apt/devel apt.spec,1.9,1.10
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Mar 3 19:30:01 UTC 2005
Author: thias
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/apt/devel
Modified Files:
apt.spec
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec 18 Feb 2005 22:14:10 -0000 1.9
+++ apt.spec 3 Mar 2005 19:29:59 -0000 1.10
@@ -18,7 +18,6 @@
Name: apt
Version: 0.5.15cnc6
Release: 16.%{svnver}
-Epoch: 0
Group: System Environment/Base
URL: https://moin.conectiva.com.br/AptRpm
License: GPL
@@ -92,7 +91,7 @@
BuildRequires: python-devel >= 0: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
+# for version detection to work
BuildRequires: fedora-release
%if %{generate_rpmpriorities}
BuildRequires: %{_bindir}/xsltproc, %{comps}
@@ -120,14 +119,14 @@
%description
A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to
-install and upgrade packages. APT features complete installation ordering,
+It provides the apt-get utility that provides a simpler, safer way to
+install and upgrade packages. APT features complete installation ordering,
multiple source capability and several other unique features.
%package devel
Summary: Development files and documentation for APT's libapt-pkg.
Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: rpm-devel
%description devel
This package contains the header files and static libraries for developing
@@ -136,7 +135,7 @@
%package python
Summary: Python bindings for libapt-pkg
Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
%description python
The apt-python package contains a module which allows python programs
@@ -145,7 +144,7 @@
%package groupinstall
Summary: Add commands to install and remove package groups.
Group: System Environment/Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: rhpl, comps
%description groupinstall
This package adds four new commands to apt for installing, removing and viewing
@@ -156,7 +155,7 @@
apt-get groupremove <groupname> [<groupname2> ..]
The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC
+system installer) and other package management tools of RHL/RHEL/FC
distributions.
@@ -184,7 +183,7 @@
%configure --disable-dependency-tracking
SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags}
+make %{?_smp_mflags}
# prevent re-generation of the python wrapper, requires a patched swig :(
#touch python/apt.py python/apt_wrap.cxx
@@ -285,10 +284,10 @@
fi
exit 0
-%post
+%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
@@ -310,7 +309,7 @@
%config(noreplace) %{_sysconfdir}/sysconfig/apt
%config(noreplace) %{_sysconfdir}/apt/rpmpriorities
%config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
%config(noreplace) %{_sysconfdir}/apt/sources.list
%config(noreplace) %{_sysconfdir}/apt/vendors.list
# NOTE: no noreplace on these because we WANT to be able to change the defaults
@@ -399,7 +398,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 rpmprioties file for rawhide
* Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
- update to revision r361
@@ -407,7 +406,7 @@
- provide apt-mirrorselect so repo-configs can depend on it
- preliminary fixes for x86_64:
- put scripts to /usr/share/apt/scripts instead of /usr/lib
- - build python bindings with -fPIC
+ - build python bindings with -fPIC
* Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
- update to revision r360
@@ -433,7 +432,7 @@
- add new subpackage for groupinstall (to avoid dependening on comps and rhpl
for core apt)
- update to revision 353 from upstream for various bugfixes and enhancements,
- drop merged patches
+ drop merged patches
- remove NOISY=1 from make, hasn't done anything in ages..
* Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +491,7 @@
- Ville's docbook building fix
* Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf
+- add upgrade-virtual=true back to default.conf
- updated version of upgradevirt.lua, fixed kernel-module package handling
* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +509,7 @@
- remember to set kernel::module-prefix in default.conf
- add upgradevirt.lua to all the necessary new slot
- move kernel from Essential priority to Important in rpmpriorities, allow-
- duplicated packages don't behave well with Essential priority
+ duplicated packages don't behave well with Essential priority
* Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
- update to 0.5.15cnc6
@@ -531,14 +530,14 @@
* Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
- Pull patch for revs 266-274 from upstream, containing various important
- fixes (epoch handling, build system related etc)
+ fixes (epoch handling, build system related etc)
* Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
- Fix build on FC2-test1 (conditional libselinux-devel buildreq)
* Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
- automatically handle fedora.us style kernel-module packages with kernel
- updates
+ updates
- don't run mirror-selector if quiet mode set (== non-interactive)
- don't trash sources.list on upgrade, only if user chooses to do so
@@ -557,7 +556,7 @@
* Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
- make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us
+- use mirror lists on fedora.us
- include Fedora Legacy gpg key
* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +580,7 @@
- drop patches merged upstream
* Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf
+- remove extranuous 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
@@ -650,7 +649,7 @@
* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
- update rpmlib patch to -7 which has more sensible error reporting
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
- update to 0.5.15cnc2
- remove patches 6-9, they're merged upstream now
- use fedora-style buildroot
@@ -749,12 +748,12 @@
- drop patches merged upstream
* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get
+- patch from upstream to fix a security problem where lua-scripts can get
accidentally executed from cwd
* Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
- apt doesn't like build deps on versioned virtual provides -> only RH7.3
- package buildrequires python2-devel, newer ones have python-devel
+ package buildrequires python2-devel, newer ones have python-devel
* Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
- fix the proxy template format in apt.conf
@@ -778,11 +777,11 @@
- fix #259
- add missing ncurses-devel buildreq (for apt-shell)
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
- add missing libelf-devel buildreq for RH8.0 (#254)
- add missing readline-devel buildreq (for apt-shell)
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
- add /etc/apt/scripts directory (for Lua scripts)
* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +801,7 @@
* Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
- patch to speed up apt startup and genbasedir
- drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list
+- include current mirrors in sources.list
- autodetect RH version
* Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +823,7 @@
- add epoch to requires =, >= too
* Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink
+- fix segfault if rpm-dir index is a broken symlink
- rpmpriorities generated from comps.xml
- dont tag the various keys as %dir :-/
More information about the scm-commits
mailing list