0.5.15cnc5-alt2
- Added one more %triggerun to correct apt.conf, due to apt methods migration. - Applied patch from Alexey Tourbin to use systemwide lua5. - Applied patch from Sviatoslav Sviridov to workaround VendorList bug.
This commit is contained in:
parent
0501f88ac1
commit
cbb5c922e9
13
apt-0.5.15cnc5-alt-findrepos.patch
Normal file
13
apt-0.5.15cnc5-alt-findrepos.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -uprk.orig apt-0.5.15cnc5.orig/apt-pkg/rpm/rpmindexfile.cc apt-0.5.15cnc5/apt-pkg/rpm/rpmindexfile.cc
|
||||
--- apt-0.5.15cnc5.orig/apt-pkg/rpm/rpmindexfile.cc 2003-12-23 23:19:55 +0300
|
||||
+++ apt-0.5.15cnc5/apt-pkg/rpm/rpmindexfile.cc 2004-01-19 16:13:47 +0300
|
||||
@@ -638,7 +638,8 @@ class rpmSLTypeGen : public pkgSourceLis
|
||||
{
|
||||
// The registered object has no vendor, but the new one does
|
||||
// so, we make the previous one have the vendor too.
|
||||
- if ((*iter)->Vendor == NULL && Vendor != NULL)
|
||||
+ if (Vendor != NULL
|
||||
+ && ((*iter)->Vendor == NULL || (*iter)->Vendor != Vendor))
|
||||
(*iter)->Vendor = Vendor;
|
||||
return *iter;
|
||||
}
|
||||
108
apt-0.5.15cnc5-alt-system-lua5.patch
Normal file
108
apt-0.5.15cnc5-alt-system-lua5.patch
Normal file
@ -0,0 +1,108 @@
|
||||
--- apt-0.5.15cnc5~/lua/Makefile.am 2003-12-23 20:14:06 +0000
|
||||
+++ apt-0.5.15cnc5/lua/Makefile.am 2004-01-16 18:25:47 +0000
|
||||
@@ -1,7 +1,6 @@
|
||||
|
||||
if WITH_LUA
|
||||
-noinst_LTLIBRARIES = liblua.la
|
||||
-noinst_PROGRAMS = lua/lua luac/luac
|
||||
+noinst_LTLIBRARIES = libluapt.la
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
@@ -11,75 +10,19 @@ EXTRA_DIST = \
|
||||
local/userconfig.c \
|
||||
local/linit.lua
|
||||
|
||||
-LDADD = liblua.la
|
||||
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/local
|
||||
-
|
||||
-lua_lua_SOURCES = lua/lua.c
|
||||
-lua_lua_CFLAGS = -DLUA_USERCONFIG='"$(srcdir)/local/userconfig.c"'
|
||||
-#lua_lua_LDADD = $(LDADD) -lreadline -lhistory -lncurses
|
||||
-luac_luac_SOURCES = luac/luac.c luac/print.c lopcodes.c
|
||||
-luac_luac_CFLAGS = -DLUA_OPNAMES
|
||||
+LDADD = libluapt.la
|
||||
+INCLUDES = -I$(srcdir)/local
|
||||
|
||||
-liblua_la_CFLAGS = -DUSE_DLOPEN -DWITH_POSIX
|
||||
-liblua_la_LIBADD = -lm -ldl
|
||||
-liblua_la_SOURCES = \
|
||||
+libluapt_la_LIBADD = -llua -llualib
|
||||
+libluapt_la_CFLAGS = -DWITH_POSIX
|
||||
+libluapt_la_SOURCES = \
|
||||
local/linit.c \
|
||||
local/linit.h \
|
||||
local/linit.lch \
|
||||
local/lposix.h \
|
||||
local/lposix.c \
|
||||
local/lrexlib.h \
|
||||
- local/lrexlib.c \
|
||||
- include/lauxlib.h \
|
||||
- include/lua.h \
|
||||
- include/lualib.h \
|
||||
- lib/lauxlib.c \
|
||||
- lib/lbaselib.c \
|
||||
- lib/ldblib.c \
|
||||
- lib/liolib.c \
|
||||
- lib/lmathlib.c \
|
||||
- lib/loadlib.c \
|
||||
- lib/lstrlib.c \
|
||||
- lib/ltablib.c \
|
||||
- lapi.c \
|
||||
- lapi.h \
|
||||
- lcode.c \
|
||||
- lcode.h \
|
||||
- ldebug.c \
|
||||
- ldebug.h \
|
||||
- ldo.c \
|
||||
- ldo.h \
|
||||
- ldump.c \
|
||||
- lfunc.c \
|
||||
- lfunc.h \
|
||||
- lgc.c \
|
||||
- lgc.h \
|
||||
- llex.c \
|
||||
- llex.h \
|
||||
- llimits.h \
|
||||
- lmem.c \
|
||||
- lmem.h \
|
||||
- lobject.c \
|
||||
- lobject.h \
|
||||
- lopcodes.c \
|
||||
- lopcodes.h \
|
||||
- lparser.c \
|
||||
- lparser.h \
|
||||
- lstate.c \
|
||||
- lstate.h \
|
||||
- lstring.c \
|
||||
- lstring.h \
|
||||
- ltable.c \
|
||||
- ltable.h \
|
||||
- ltests.c \
|
||||
- ltm.c \
|
||||
- ltm.h \
|
||||
- lundump.c \
|
||||
- lundump.h \
|
||||
- lvm.c \
|
||||
- lvm.h \
|
||||
- lzio.c \
|
||||
- lzio.h
|
||||
+ local/lrexlib.c
|
||||
|
||||
local/linit.lch: local/linit.lua
|
||||
bin2c local/linit.lua > local/linit.lch
|
||||
--- apt-0.5.15cnc5~/apt-pkg/Makefile.am 2003-12-23 20:23:17 +0000
|
||||
+++ apt-0.5.15cnc5/apt-pkg/Makefile.am 2004-01-16 19:06:12 +0000
|
||||
@@ -6,10 +6,10 @@ libapt_pkg_la_LDFLAGS = -version-info 1:
|
||||
|
||||
AM_CPPFLAGS = -DLIBDIR=\"$(libdir)\"
|
||||
|
||||
-INCLUDES = -I$(top_srcdir)/lua/include -I$(top_srcdir)/lua/local
|
||||
+INCLUDES = -I$(top_srcdir)/lua/local
|
||||
|
||||
if WITH_LUA
|
||||
-libapt_pkg_la_LIBADD += $(top_builddir)/lua/liblua.la
|
||||
+libapt_pkg_la_LIBADD += $(top_builddir)/lua/libluapt.la
|
||||
endif
|
||||
|
||||
libapt_pkg_la_SOURCES = \
|
||||
36
apt.spec
36
apt.spec
@ -2,7 +2,7 @@
|
||||
|
||||
Name: apt
|
||||
Version: 0.5.15cnc5
|
||||
Release: alt1
|
||||
Release: alt2
|
||||
|
||||
Summary: Debian's Advanced Packaging Tool with RPM support
|
||||
Summary(ru_RU.CP1251): Debian APT - Óñîâåðøåíñòâîâàííîå ñðåäñòâî óïðàâëåíèÿ ïàêåòàìè ñ ïîääåðæêîé RPM
|
||||
@ -18,8 +18,7 @@ Source3: README.rsync
|
||||
Source4: apt.ru.po
|
||||
Source5: ChangeLog-rpm.old
|
||||
|
||||
Patch1: apt-0.5.15cnc5-alt-libtool.patch
|
||||
|
||||
Patch10: apt-0.5.15cnc5-alt-libtool.patch
|
||||
Patch11: apt-0.5.15cnc5-alt-fixes.patch
|
||||
Patch12: apt-0.5.15cnc5-alt-tinfo.patch
|
||||
Patch13: apt-0.5.15cnc5-alt-rpm-build.patch
|
||||
@ -38,6 +37,8 @@ Patch25: apt-0.5.5cnc4.1-alt-fixpriorsort.patch
|
||||
Patch26: apt-0.5.4cnc9-alt-pkgorderlist_score.patch
|
||||
Patch27: apt-0.5.15cnc5-alt-install_virtual.patch
|
||||
Patch28: apt-0.5.15cnc5-alt-virtual_scores.patch
|
||||
Patch29: apt-0.5.15cnc5-alt-system-lua5.patch
|
||||
Patch30: apt-0.5.15cnc5-alt-findrepos.patch
|
||||
|
||||
# Normally not applied, but useful.
|
||||
Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
|
||||
@ -53,6 +54,9 @@ BuildPreReq: librpm-devel >= 4.0.4-alt28
|
||||
# for docs.
|
||||
BuildPreReq: docbook-utils
|
||||
|
||||
# lua5.
|
||||
BuildPreReq: liblua5-devel
|
||||
|
||||
%def_disable static
|
||||
%{?_enable_static:BuildPreReq: glibc-devel-static}
|
||||
|
||||
@ -189,7 +193,7 @@ This package contains method 'rsync' for APT.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
@ -208,6 +212,14 @@ This package contains method 'rsync' for APT.
|
||||
%patch26 -p1
|
||||
%patch27 -p1
|
||||
%patch28 -p1
|
||||
%patch29 -p1
|
||||
%patch30 -p1
|
||||
|
||||
# Use system-wide lua5
|
||||
pushd lua
|
||||
# keep only local/ and lua/
|
||||
%__rm -rfv include lib luac *.[ch]
|
||||
popd
|
||||
|
||||
# Turn it on only if you want to see the debugging messages:
|
||||
#%patch101 -p1 -b .getsrc-debug
|
||||
@ -256,10 +268,16 @@ find %buildroot%_includedir -type f -name rpmshowprogress.h -print -delete
|
||||
|
||||
%find_lang %name
|
||||
|
||||
%triggerun -- apt < 0.5.4
|
||||
%triggerun -- apt < 0:0.5.4
|
||||
CONF=/etc/apt/apt.conf
|
||||
if [ -s "$CONF" ]; then
|
||||
%__subst 's/HoldPkgs/Hold/;s/AllowedDupPkgs/Allow-Duplicated/;s/IgnorePkgs/Ignore/;s/PostInstall/Post-Install/;s|Methods .*|Methods "/usr/lib/apt";|;s|PubringPath *"\([^"]*\)"|Pubring "\1/pubring.gpg"|g' "$CONF"
|
||||
%__subst 's/HoldPkgs/Hold/;s/AllowedDupPkgs/Allow-Duplicated/;s/IgnorePkgs/Ignore/;s/PostInstall/Post-Install/;s|Methods .*|Methods "/usr/lib/apt/methods";|;s|PubringPath *"\([^"]*\)"|Pubring "\1/pubring.gpg"|g' "$CONF"
|
||||
fi
|
||||
|
||||
%triggerun -- apt < 0:0.5.15cnc5-alt2
|
||||
CONF=/etc/apt/apt.conf
|
||||
if [ -s "$CONF" ]; then
|
||||
%__subst -p 's,"/usr/lib/apt","/usr/lib/apt/methods",g' "$CONF"
|
||||
fi
|
||||
|
||||
%post -n libapt -p %post_ldconfig
|
||||
@ -308,6 +326,12 @@ fi
|
||||
# Probably %%doc with README.rsync?
|
||||
|
||||
%changelog
|
||||
* Mon Jan 19 2004 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc5-alt2
|
||||
- Added one more %%triggerun to correct apt.conf,
|
||||
due to apt methods migration.
|
||||
- Applied patch from Alexey Tourbin to use systemwide lua5.
|
||||
- Applied patch from Sviatoslav Sviridov to workaround VendorList bug.
|
||||
|
||||
* Fri Jan 16 2004 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc5-alt1
|
||||
- Specfile cleanup.
|
||||
- Rediffed patches.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user