git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
bin/rpmmerge: +/java.security
[nethome.git]
/
bin
/
rpmmerge
diff --git
a/bin/rpmmerge
b/bin/rpmmerge
index
baec0c1
..
a163307
100755
(executable)
--- a/
bin/rpmmerge
+++ b/
bin/rpmmerge
@@
-21,7
+21,9
@@
for base in $l;do
if test ! -f $orig
then
- cmp $base $base.rpmnew
+ if [ "$base" = "${base%/java.security}" ];then
+ cmp $base $base.rpmnew
+ fi
mv -f $base.rpmnew $base
continue
fi