sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.alt:/people/ldv/packages/rpm into mod

Browse Source 
Conflicts:

	autodeps/linux.prov.in
	autodeps/linux.req.in
This commit is contained in:
Alexey Tourbin 2007-03-18 12:16:52 +03:00
commit 434d4daed5
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autodeps/linux.prov.in
View File

@ -276,7 +276,7 @@ while IFS= read -r f; do
if t="$(file -bL "$f")"; then
if [ -z "${t##* text*}" ]; then
ListScriptProvs "$f" "$t"
elif [ -z "${t##*MS Windows PE*}" ]; then
elif [ -z "${t##*Mono/.Net assembly*}" -o -z "${t##*MS Windows PE*}" ]; then
[ -z "$LIST_MONO" ] && LIST_MONO="$f" || LIST_MONO="$LIST_MONO
$f"
elif [ "${f##*/}" = '__init__.py' ]; then

2
autodeps/linux.req.in
View File

@ -290,7 +290,7 @@ $r"
}
while IFS= read -r f; do
if [ -z "${t##*MS Windows PE*}" ]; then
if [ -z "${t##*Mono/.Net assembly*}" -o -z "${t##*MS Windows PE*}" ]; then
[ -z "$LIST_MONO" ] && LIST_MONO="$f" || LIST_MONO="$LIST_MONO
$f"
elif [ -z "${t##*Zip archive data*}" -a -z "${f##*.jar}" ] ||

7
rpm-4_0.spec
View File

@ -4,7 +4,7 @@
Name: %rpm_name
Version: %rpm_version
Release: alt73
Release: alt74
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown')
@ -524,6 +524,11 @@ fi
%endif #with contrib
%changelog
* Sat Mar 17 2007 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt74
- find-provides, find-requires:
+ Added support for files of type "Mono/.Net assembly" to repair
Mono support when new file(1) is installed (#11088, ildar@).
* Thu Feb 22 2007 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt73
- Updated gendiff utility (Alexey Tourbin).
- Added hooks for Java autoreq facility (Damir Shayhutdinov).