Re: [Rpm-maint] [rpm-software-management/rpm] License of python-rpm-generators (#471)

2019-04-20 Thread Ville Skyttä
LGPLv2.1(+) or GPLv2(+) is fine with me.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/471#issuecomment-485118161___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] License of find-lang.sh is ambiguous around modification (#595)

2018-11-09 Thread Ville Skyttä
- [x] @scop ok with relicensing under MIT

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/595#issuecomment-437430364___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Invoke python-macro-helper with -Es python args (#341)

2017-10-25 Thread Ville Skyttä
> I don't think that passing -E is good

Could you elaborate on that a bit, especially when you think -s /is/
good? Without -s, code from user site packages is loaded, potentially
interfering with the commands. Without -E, PYTHONPATH from environment
can be used to do exactly the same.

(If python3 could be assumed, I would have used -I here. Which BTW is
what I did in https://bugzilla.redhat.com/show_bug.cgi?id=1506355)


-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/341#issuecomment-339453344___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Invoke python-macro-helper with -Es python args (#341)

2017-10-25 Thread Ville Skyttä
To limit environment and user home dir influence.
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/341

-- Commit Summary --

  * Invoke python-macro-helper with -Es python args

-- File Changes --

M macros.in (6)
M scripts/python-macro-helper (2)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/341.patch
https://github.com/rpm-software-management/rpm/pull/341.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/341
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-10-23 Thread Ville Skyttä
@pmatilai @Conan-Kudo ping?

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-338811478___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-08-28 Thread Ville Skyttä
scop commented on this pull request.



> @@ -0,0 +1,27 @@
+#!/usr/bin/python -tt

Shouldn't really matter all that much, because the script is invoked with an 
explicit "outside" interpreter without the shebang affecting anything, but 
meh... dropped.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#discussion_r135551002___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-08-28 Thread Ville Skyttä
@scop pushed 1 commit.

9e192ce  python-macro-helper: Drop -tt from shebang


-- 
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221/files/f4ee9662cf5c0a04e1928487f1480eccc6d598b1..9e192cef134dd149e7813e7fc93bfa193ee95e4a
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-08-28 Thread Ville Skyttä
Rebased. @pmatilai ping?

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-325380081___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-06-29 Thread Ville Skyttä
I don't see how this change would affect that use case at all. Before this 
change, the macros were expanded using `%{__python}`, and they still are (the 
shebang in the scriptlet is not used).

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-311886430___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-06-25 Thread Ville Skyttä
Ping?

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-310887287___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Spelling fixes (#241)

2017-06-25 Thread Ville Skyttä

You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/241

-- Commit Summary --

  * Spelling fixes

-- File Changes --

M CHANGES (18)
M build/files.c (4)
M doc/hacking.doxy.in (2)
M doc/librpm.doxy.in (2)
M doc/rpmbuild.8 (2)
M lib/rpmds.h (6)
M lib/rpmrc.c (2)
M macros.in (4)
M rpmio/macro.c (2)
M rpmio/rpmio.c (2)
M rpmio/rpmmacro.h (2)
M scripts/find-debuginfo.sh (4)
M tests/rpmbuildid.at (2)
M tools/debugedit.c (4)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/241.patch
https://github.com/rpm-software-management/rpm/pull/241.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/241
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-06-19 Thread Ville Skyttä
Combining done, script renamed to python-macro-helper. I think the installation 
point in rpm's dir structure serves as a prefix/namespace already.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-309346430___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-06-07 Thread Ville Skyttä
It'll take me about a week and a half until I'll get back to this. If anyone 
wants to ahead with this in the meantime, please feel free.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-306988703___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-06-07 Thread Ville Skyttä
`python_sitedirs` is otherwise fine, but it will also in its current form be 
used to retrieve the python version, which seems a bit odd to me. Also, perhaps 
it will be extended to generate some new other macros in the future. I'm 
currently thinking along the lines of `python-macrotool` or `python-macro` or 
`python-macros`. 

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-306803359___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-05-21 Thread Ville Skyttä
Oh well, anyway, since it was not my purpose to actually make the sys.stdout -> 
print changes, they're back to sys.stdout.write in this latest revision.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-303005050___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-05-21 Thread Ville Skyttä
Oops, the print stuff is like I said in the macros shipped by Fedora's 
python-rpm-macros, not here (here they were using sys.stdout.write). But the 
rest of what I said still stands.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-303003879___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-05-21 Thread Ville Skyttä
`.py` suffixes removed.

I don't think there's anything fragile about this particular use of `print`, 
nor does it require the `print_function` import. It is also nothing new, the 
previous `%python_sitelib` and `%python_sitearch` definitions used it too.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221#issuecomment-303003577___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Python macro improvements (#221)

2017-05-21 Thread Ville Skyttä

You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/221

-- Commit Summary --

  * Use scripts instead of python -c to retrieve %python_* values
  * Get %python_version from platform.python_version_tuple

-- File Changes --

M macros.in (6)
M scripts/Makefile.am (2)
A scripts/python_sitearch.py (5)
A scripts/python_sitelib.py (5)
A scripts/python_version.py (5)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/221.patch
https://github.com/rpm-software-management/rpm/pull/221.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/221
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] find-lang.sh: Add --with-kde KF5 support (#112)

2017-01-01 Thread Ville Skyttä

You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/112

-- Commit Summary --

  * find-lang.sh: Add --with-kde KF5 support

-- File Changes --

M scripts/find-lang.sh (13)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/112.patch
https://github.com/rpm-software-management/rpm/pull/112.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/112
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Various python fixes (#71)

2016-06-04 Thread Ville Skyttä

You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/71

-- Commit Summary --

  * python: Fix signalsCaught() docstring
  * python: Trivial code cleanups
  * python: Remove unnecessary shebang
  * python: Close file in _f2hdr also if hdrFromFdno fails

-- File Changes --

M python/rpm/__init__.py (2)
M python/rpm/transaction.py (14)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/71.patch
https://github.com/rpm-software-management/rpm/pull/71.diff

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/71
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Spelling fixes (#70)

2016-06-04 Thread Ville Skyttä

You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/70

-- Commit Summary --

  * Spelling fixes

-- File Changes --

M doc/rpmspec.8 (2)
M lib/rpmfi.c (2)
M lib/rpmtriggers.c (2)
M misc/rpmxprogname.c (2)
M python/rpm/__init__.py (2)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/70.patch
https://github.com/rpm-software-management/rpm/pull/70.diff

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/70
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm] brp-python-hardlink: Use cmp instead of sha1summing (#30)

2015-11-13 Thread Ville Skyttä
diffutils is a rpm-build dependency anyway nowadays, e.g. find-debuginfo.sh 
uses cmp too. See PR #16 for discussion.
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/30

-- Commit Summary --

  * brp-python-hardlink: Use cmp instead of sha1summing

-- File Changes --

M scripts/brp-python-hardlink (6)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/30.patch
https://github.com/rpm-software-management/rpm/pull/30.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/30
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm] pythoneggs.py: flake8 fixes (#31)

2015-11-13 Thread Ville Skyttä
...except long lines warnings.
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/31

-- Commit Summary --

  * pythoneggs.py: flake8 fixes

-- File Changes --

M scripts/pythoneggs.py (40)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/31.patch
https://github.com/rpm-software-management/rpm/pull/31.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/31
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [PATCH] perl.{prov,req} improvments

2014-09-18 Thread Ville Skyttä
On Thu, Sep 18, 2014 at 9:38 AM, Jerome Quelin jque...@gmail.com wrote:
 This patch only acknowledges this fact, and allows _ in versions.

This results in the underscores also ending up in the Provides. I
don't think that's a good thing as IIRC rpm's version comparison does
not treat it the same way as perl does. So for example for module
version spelled as 0.95_01 the Provides would also be perl($something)
= 0.95_01. I suppose allowing the underscore would be ok if it would
be sanitized before output, i.e. 0.95_01 would result in Provides
perl($something) = 0.9501
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [PATCH] perl.{prov,req} improvments

2014-09-18 Thread Ville Skyttä
On Thu, Sep 18, 2014 at 1:38 PM, Michael Schroeder m...@suse.de wrote:

 Well, 0.95_01 is actually more correct than 0.9501. Perl's versions
 are actually more or less floating point numbers, thus 0.9501 is
 supposed to be less than 0.96.

 From rpm's side, '_' is exactly equivalent to '.', so 0.95_01 is
 the same as 0.95.01, which is probably what the upstream author
 indended.

I see. I can see how this could work, but there are so many
supposeds, probablys, guesses of intent and non-obvious
assumptions involved that I'm just grateful that I don't have to be
debugging any of this stuff unless I choose to, especially as IIRC
there are no regression tests available for these beasts :)
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [PATCH] python: flake8 cleanups

2014-04-05 Thread Ville Skyttä
---
 python/rpm/__init__.py| 18 --
 python/rpm/transaction.py | 15 ++-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/python/rpm/__init__.py b/python/rpm/__init__.py
index 196be3c..3b750db 100644
--- a/python/rpm/__init__.py
+++ b/python/rpm/__init__.py
@@ -5,7 +5,6 @@ This module enables you to manipulate rpms and the rpm database.
 
 
 import warnings
-import os
 from rpm._rpm import *
 from rpm.transaction import *
 import rpm._rpm as _rpm
@@ -32,10 +31,12 @@ except ImportError:
 # backwards compatibility + give the same class both ways
 ts = TransactionSet
 
+
 def headerLoad(*args, **kwds):
 warnings.warn(Use rpm.hdr() instead., DeprecationWarning, stacklevel=2)
 return hdr(*args, **kwds)
 
+
 def _doHeaderListFromFD(rpm_fd, retrofit):
 hlist = []
 while 1:
@@ -49,17 +50,20 @@ def _doHeaderListFromFD(rpm_fd, retrofit):
 
 return hlist
 
-def readHeaderListFromFD(file_desc, retrofit = True):
+
+def readHeaderListFromFD(file_desc, retrofit=True):
 if not isinstance(file_desc, fd):
 file_desc = fd(file_desc)
 return _doHeaderListFromFD(file_desc, retrofit)
-
-def readHeaderListFromFile(path, retrofit = True):
+
+
+def readHeaderListFromFile(path, retrofit=True):
 f = fd(path)
 hlist = _doHeaderListFromFD(f, retrofit)
 f.close()
 return hlist
-
+
+
 def readHeaderFromFD(file_desc):
 if not isinstance(file_desc, fd):
 file_desc = fd(file_desc)
@@ -72,6 +76,7 @@ def readHeaderFromFD(file_desc):
 
 return (h, offset)
 
+
 def signalsCaught(siglist):
 caught = []
 for sig in siglist:
@@ -80,5 +85,6 @@ def signalsCaught(siglist):
 
 return caught
 
-def dsSingle(TagN, N, EVR = , Flags = RPMSENSE_ANY):
+
+def dsSingle(TagN, N, EVR=, Flags=RPMSENSE_ANY):
 return ds((N, Flags, EVR), TagN)
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
index db7ca67..35d7a15 100644
--- a/python/rpm/transaction.py
+++ b/python/rpm/transaction.py
@@ -9,6 +9,7 @@ if sys.version_info[0] == 3:
 else:
 _string_types = basestring,
 
+
 # TODO: migrate relevant documentation from C-side
 class TransactionSet(TransactionSetCore):
 _probFilter = 0
@@ -17,7 +18,7 @@ class TransactionSet(TransactionSetCore):
 oval = getattr(self, attr)
 setattr(self, attr, val)
 return oval
-
+
 def setVSFlags(self, flags):
 return self._wrapSetGet('_vsflags', flags)
 
@@ -138,14 +139,18 @@ class TransactionSet(TransactionSetCore):
 needflags = rpm.RPMSENSE_ANY
 if len(needs) == 3:
 needop = needs[1]
-if needop.find('') = 0: needflags |= rpm.RPMSENSE_LESS
-if needop.find('=') = 0: needflags |= rpm.RPMSENSE_EQUAL
-if needop.find('') = 0: needflags |= rpm.RPMSENSE_GREATER
+if needop.find('') = 0:
+needflags |= rpm.RPMSENSE_LESS
+if needop.find('=') = 0:
+needflags |= rpm.RPMSENSE_EQUAL
+if needop.find('') = 0:
+needflags |= rpm.RPMSENSE_GREATER
 needver = needs[2]
 else:
 needver = 
 
-res.append(((n, v, r),(needname,needver),needflags,sense,p.key))
+res.append(((n, v, r),
+(needname, needver), needflags, sense, p.key))
 
 return res
 
-- 
1.9.0

___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [PATCH] Search for 7za and 7z for 7-zip.

2013-07-29 Thread Ville Skyttä
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ec85ede..7351291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ fi
 dnl
 dnl Find some common programs
 dnl
-AC_PATH_PROG(__7ZIP, 7zip, /usr/bin/7za, $MYPATH)
+AC_PATH_PROGS(__7ZIP, [7zip 7za 7z], /usr/bin/7za, $MYPATH)
 AC_PATH_PROG(__BZIP2, bzip2, /usr/bin/bzip2, $MYPATH)
 AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
 AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
-- 
1.7.11.7

___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [PATCH] Spelling fixes.

2013-02-16 Thread Ville Skyttä
---
 CHANGES| 20 
 INSTALL| 12 +-
 autodeps/freebsdelf.req|  2 +-
 autodeps/hpux.prov |  2 +-
 autodeps/osf.req   |  2 +-
 lib/fsm.c  |  4 ++--
 lib/header.c   |  4 ++--
 lib/rpmdb.c|  4 ++--
 lib/rpmdb.h|  4 ++--
 lib/rpmfi.c|  2 +-
 lib/rpmfi.h|  6 ++---
 lib/rpmprob.h  |  2 +-
 lib/rpmts.h|  4 ++--
 lib/rpmvercmp.c|  2 +-
 lib/transaction.c  |  4 ++--
 macros.in  |  2 +-
 misc/fts.h |  4 ++--
 python/header-py.c |  2 +-
 python/rpm/transaction.py  |  2 +-
 python/rpmts-py.c  |  2 +-
 rpmio/argv.h   |  6 ++---
 rpmio/rpmpgp.h |  2 +-
 rpmio/rpmstrpool.c |  2 +-
 rpmio/rpmutil.h|  2 +-
 scripts/brp-python-bytecompile |  6 ++---
 scripts/perl.prov  |  4 ++--
 scripts/rpm_fulldb_update  | 14 ++--
 scripts/rpmsync| 52 +-
 scripts/vpkg-provides.sh   | 10 
 tests/rpmpython.at |  2 +-
 30 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/CHANGES b/CHANGES
index d6365c1..dc07f51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -508,7 +508,7 @@
- use rpmfiFClass() underneath --fileclass.
- use rpmfiFDepends() underneath --fileprovide and --filerequire.
- python: add fi.FColor() and fi.FClass() methods.
-   - calculate dependency color and refernces.
+   - calculate dependency color and references.
- python: add ds.Color() and ds.Refs() methods.
- fix: typo in assertion.
- add rpmts/rpmte/rpmfi/rpmds element colors.
@@ -656,7 +656,7 @@
- eliminate db1 support.
- enable CDB by default.
- use DBT_DB_MALLOC to eliminate re-malloc'ing header blobs.
-   - rework most of rpmdb.c prepatory to implementing duplicates.
+   - rework most of rpmdb.c preparatory to implementing duplicates.
- fix: 2 memory leaks in headerSprintf.
- fix: db mire's access out-of-bounds memory.
- plug install mode leaks.
@@ -958,7 +958,7 @@
- upgrade to db-3.3.4.
- fix: filter duplicate package removals (#35828).
- add armv3l arch.
-   - fix: i18n strings need 1 on sucess return code (#41313).
+   - fix: i18n strings need 1 on success return code (#41313).
- fix: skip %ghost files when building packages (#38218).
- headerFree() returns NULL, _free is C++ safe.
- remove all header region assertion failures, return NULL instead.
@@ -1054,7 +1054,7 @@
- popthelp.c: don't use stpcpy to avoid portability grief (#47500).
- permit alias/exec description/arg text to be set from popt config.
- python: rhnLoad/rhnUnload to check header digest.
-   - package version now configureable, default v3.
+   - package version now configurable, default v3.
- rename rpm libraries to have version with libtool -release.
- fix: -i CLI context broken Yet Again.
- unlink all __db.nnn files before 1st db open.
@@ -1095,7 +1095,7 @@
- fix: --noscripts is another multimode option.
- add tmpdir to configure db3 tmpdir into chroot tree.
- permit lazy db opens within chroot.
-   - fix: diddle dbenv path to accomodate backing store reopen in chroot.
+   - fix: diddle dbenv path to accommodate backing store reopen in chroot.
- add support for mips (#49283).
- add __as, _build_arch, and __cxx macros (#36662, #36663, #49280).
- detailed build package error messages.
@@ -1521,7 +1521,7 @@
   expand %# just like %{#} (and with same value as shell analogues).
   macro defaults for *, 0, and # if no args specified.
   getopt on non-linux requires optind to be saved/restored.
-   - fix: don't remove file until last occurence in transaction (#4291).
+   - fix: don't remove file until last occurrence in transaction (#4291).
- resuscitate net shared paths (#4330).
- fix: macro table cannot contain NULL pointers (#4263).
- fix: last char in rpmrc w/o terminating newline lost (#4361).
@@ -1987,7 +1987,7 @@
- cpio error codes were poorly defined, causing bad error messages
- generates INSTPREFIXES tag properly, and sets RPM_INSTALL_PREFIX
  and RPM_INSTALL_PREFIXn environment variables
-   - fixed memory leak in install code which occured when net shared paths
+   - fixed memory leak in install code which occurred when net shared paths
  were used
- don't pass net shared path to rpmInstallPackage() -- it looks 
  directly in the rpmrc entries
@@ -2314,7 +2314,7 @@
 2.3.9 - 2.3.10:
- 

[Rpm-maint] lua extension API stability

2011-06-04 Thread Ville Skyttä
Hello,

I'm considering using lua in some scriptlets, and noticed that while
posix.symlink() currently exists in the posix extension included with
rpm, it no longer exists in the current upstream version, there's a 3rd
argument to posix.link() instead for that purpose:
https://github.com/rrthomas/luaposix

Are the lua APIs available to package scriptlets in rpm going to be kept
backwards compatible?
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] Patch: Add support of syslog when installing/removing packages

2011-03-03 Thread Ville Skyttä

On 03/03/2011 05:36 PM, seth vidal wrote:


rpm[$pid:[$processname|$depsolvername]] pkgname pkgstate/action


I wouldn't make it easy to add anything but $appname[$pid] to that part 
of the log entry; I suspect it could cause problems with existing 
software that parses the logs and expects to find it in some 
conventional format up until the first colon after the timestamp.

___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] Enforce install/erase order without adding a Requires:

2010-11-25 Thread Ville Skyttä
On Thursday 25 November 2010, FlorianFesti wrote:
 Hi!
 
 There have been various issues with packages that demand a special order
 of installation but do not want to Require the package to be installed
 first. So a tag that is like Requires: during ordering but ignored
 otherwise is needed.
 
 Panu had a look into the problem yesterday and it turned out this can be
 done by simply adding a new tag triple and very few additional lines of
 code. But it also turned out that's really hard to come up with a good
 name for it. After banging our heads against the wall for the morning we
 settled on OrderWithRequires: It is not really beautiful but here are
 the reasons why we preferred it over two dozen other options:
 
 * It contains Requires which make clear that it is handled exactly
 like normal Requires during ordering.

If it's actually not a Requires, it shouldn't IMO contain that word.

If Suggests/Enhances are not desirable for this, how about DependencyOrder?

Some actual, concrete example cases exactly what for and how this would be 
used might result in better suggestions.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] Patch: repair nosource/nopatch tag insertion

2010-04-09 Thread Ville Skyttä
On Friday 09 April 2010, Michael Schroeder wrote:
 Maybe NOSOURCE/NOPATCH should not be internal
 at all, though. They are useful to check if a rpm is src or
 nosrc, there is no other way to detect this.

I don't know if it's correct, but in rpmlint we decide that based on whether 
the source rpm has ghost files or not.  If it does, we treat it as nosrc and I 
believe this method has worked fine.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [PATCH 01/15] Generalize python configuration code to support both Python 2.* and Python 3.*

2009-10-16 Thread Ville Skyttä
On Thursday 15 October 2009, David Malcolm wrote:

  +WITH_PYTHON_INCLUDE=`${PYTHON} -c 'from distutils.sysconfig import *; 
import sys; sys.stdout.write(%s\n % get_python_inc())'` 

I think the last statement could be just sys.stdout.write(get_python_inc()), 
no need for the newline.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] RPM 4.7.0 released!

2009-04-16 Thread Ville Skyttä
On Thursday 16 April 2009, Panu Matilainen wrote:

 More detailed compatibility information about the new features is
 available in http://rpm.org/wiki/Releases/4.7.0#Compatibilitynotes

I would add a compatibility note about *.py in s?bin dirs no longer being 
byte-compiled: if one used %exclude to get rid of them in rpmbuild  4.7, the 
package will no longer build with 4.7 because the %exclude doesn't hit 
anything and fails.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [PATCH] Improve Qt support in find-lang.sh

2009-01-29 Thread Ville Skyttä
Hello,

The attached patch improves Qt translation support in find-lang.sh, especially 
the --all-name part of it.  I suppose this could be implemented in a prettier 
way by someone with better sed-fu than mine, but this works for me.  One test 
case is Qt 4 (/usr/share/qt4/translations in Fedora 9), that's what I used 
when verifying the changes.
From 2cbe531ceede4448da13788f21d40492297ed990 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= ville.sky...@iki.fi
Date: Thu, 29 Jan 2009 20:42:43 +0200
Subject: [PATCH] Improve Qt translation support, particularly --all-name.

---
 scripts/find-lang.sh |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
index 283bcac..2dd9e0d 100755
--- a/scripts/find-lang.sh
+++ b/scripts/find-lang.sh
@@ -161,8 +161,11 @@ fi
 
 find $TOP_DIR -type f -o -type l|sed '
 s:'$TOP_DIR'::
-'$NO_ALL_NAME$QT's:\(.*/'$NAME'_\([^/.]\+\)\.qm$\):%lang(\2) \1:
-'$ALL_NAME$QT's:\(.*[/_]\([^/_]\+\)\.qm$\):%lang(\2) \1:
+'$NO_ALL_NAME$QT's:\(.*/'$NAME'_\([a-zA-Z]\{2\}\(_[a-zA-Z]\{2\}\)\?\)\.qm$\):%lang(\2) \1:
+'$ALL_NAME$QT's:\(.*/[^/_]\+_\([a-zA-Z]\{2\}_[a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'$ALL_NAME$QT's:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'$ALL_NAME$QT's:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}_[a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'$ALL_NAME$QT's:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
 s:^[^%].*::
 s:%lang(C) ::
 /^$/d'  $MO_NAME
-- 
1.5.6.6

___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] nss/nspr location for configure

2008-11-26 Thread Ville Skyttä
On Wednesday 26 November 2008, Jan Engelhardt wrote:

 rpm's configure script cannot find nss/nspr even though these are
 installed. As it turns out, configure.ac does not use nss/nspr's
 pkg-config files

Unless I'm mistaken, upstream nss and nspr do not ship pkgconfig files, 
they're distro additions and thus depending on them could be fragile.  (I 
wonder if distro packagers haven't bothered to submit the *.pc they add 
upstream or if upstream has rejected them.)

 nor the nspr-config utility nor offers a way to 
 pinpoint to the location.

These on the other hand sound like something that should be fixed (and I see 
you already sent a patch).
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] New RPM seems to be much more aggressive about stripping binaries

2008-09-02 Thread Ville Skyttä
On Tuesday 02 September 2008, Richard W.M. Jones wrote:
 I don't know if this is the new version of RPM in Fedora Rawhide, or
 just coincidence, but recently I've noticed that RPM has become even
 more aggressive about stripping binaries.

Just out of interest, how?  Is strip invoked bu rpmbuild on some files it was 
not invoked at all earlier, or does strip itself do more these days than it 
used to?

 At the moment the only way I can find to disable it is:

   %define __os_install_post /usr/lib/rpm/brp-compress %{nil}

 which is certainly taking a very big hammer to crack a small nut.  Is
 there an easier way?

One trick that at least used to work was to make sure binaries that one does 
not want stripped are non-executable at end of %install, and then restore the 
executable bits for them in %files using %attr.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] RPM Managment system.

2008-07-07 Thread Ville Skyttä
On Monday 07 July 2008, Stanislav Brabec wrote:
 Nesreen wrote:

  1- I wander that upon making a package using RPM software, can I
  assign version/build numbers for each file included in my package ,

 No, you cannot. Version/release are assigned only for packages. But you
 can have one file per package and then assign version numbers to
 particular packages.

Provides: can assign versions to just about anything.  File versions could be 
implemented for example with something like

Provides: file(/foo/bar) = 1.0.1
Provides: file(/bar/quux) = 2.0.0
...

   can I query this version number after installation?(and I assume that
  my package contains set of binaries and database files).?

 Only packages have version/release.

Provides: can be queried with --provides (and --whatprovides).
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] allow to remove Requires(pre) or not?

2008-02-27 Thread Ville Skyttä
On Tuesday 26 February 2008, Panu Matilainen wrote:
 On Sat, 23 Feb 2008, Pixel wrote:

  as for me i'm not convinced that Requires(pre) not implying Requires
  is a feature. I would be in favor of Requires(xxx) implies Requires.

 Agreed, permitting remove of (pre|post|...)-only dependencies because they
 might not be strictly needed at runtime serves no purpose at all. It only
 permits creating absurd situations like having to install another package
 in order to be able to remove something you have installed.

FWIW, I agree for Requires(preun) and Requires(postun), but not for others.  
What's the problem with allowing removal of stuff pulled in by Requires(pre) 
or Requires(post) after the corresponding %pre or %post script has already 
run and will never run again?
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] Problems with %Requires(preun):

2007-12-11 Thread Ville Skyttä
On Tuesday 11 December 2007, Scott Bambrough wrote:
 Pixel wrote:
  afaik rpm does not order package removal :-(

 Interesting.   The section on context marked dependencies in the
 snapshot version of Maximum RPM suggests it should.
[...]
 Is their a disconnect between the documentation and the code,

Very much possible.  At the time I wrote the Context marked dependencies 
chapter, I knew that erase ordering is not supported in rpm but had the 
impression that it was a known bug which would be fixed soon so I didn't feel 
like cluttering the docs with it.  Also, I'm not a rpm developer and haven't 
really even looked at the code, the doc is based on personal experience as a 
user.  (IIRC Paul Nasrat committed the doc changes for me though at the time, 
so it's possible it did get some kind of a review :))

 or how are 
 context marked dependencies supposed to work (if at all).

Apart from the erase ordering not supported issue (which AFAICT can bite 
only if your dependency is being erased in the same transaction as the 
package requiring it), and a bug in some rpm(build?) versions where some 
context marked dependencies that are in specfiles using the 
syntax Requires(post,postun) get dropped, and that dependency loops may 
make things hairy, I'm not aware of any issues.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] find-lang.sh improvements

2007-10-13 Thread Ville Skyttä
Hello,

Attached is a patch for find-lang.sh containing the following improvements:

- spelling fixes
- POSIX compliance fix for find(1) usage 
- Qt translation support
- localized man page support
- match *.omf, not *omf

Split patches available at http://scop.fedorapeople.org/patches/rpm/ if you 
prefer them that way or wish to cherry pick.
diff -r 7bcadd573028 scripts/find-lang.sh
--- a/scripts/find-lang.sh	Thu Oct 11 14:14:00 2007 +0300
+++ b/scripts/find-lang.sh	Sat Oct 13 21:13:30 2007 +0300
@@ -11,7 +11,7 @@
 #in tact and are included with any redistribution of this file or any
 #work based on this file.
 
-# 2004-06-20 Arkadiusz Mi¶kiewicz [EMAIL PROTECTED]
+# 2004-06-20 Arkadiusz Miśkiewicz [EMAIL PROTECTED]
 #   * merge PLD changes, kde, all-name (mkochano,[EMAIL PROTECTED])
 # 1999-10-19 Artur Frysiak [EMAIL PROTECTED]
 #   * added support for GNOME help files
@@ -32,8 +32,10 @@ Additional options:
 Additional options:
   --with-gnome		find GNOME help files
   --with-kde		find KDE help files
+  --with-qt		find Qt translation files
+  --with-man		find localized man pages
   --all-name		match all package/domain names
-  --without-mo		not find locales files
+  --without-mo		do not find locale files
 EOF
 exit 1
 }
@@ -54,6 +56,8 @@ shift
 
 GNOME=#
 KDE=#
+QT=#
+MAN=#
 MO=
 MO_NAME=$NAME.lang
 ALL_NAME=#
@@ -67,6 +71,14 @@ while test $# -gt 0 ; do
 		;;
 	--with-kde )
 		KDE=
+		shift
+		;;
+	--with-qt )
+		QT=
+		shift
+		;;
+	--with-man )
+		MAN=
 		shift
 		;;
 	--without-mo )
@@ -85,7 +97,7 @@ while test $# -gt 0 ; do
 esac
 done
 
-find $TOP_DIR -type f -or -type l|sed '
+find $TOP_DIR -type f -o -type l|sed '
 s:'$TOP_DIR'::
 '$ALL_NAME$MO's:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 '$NO_ALL_NAME$MO's:\(.*/share/locale/\)\([^/_]\+\)\(.*/'$NAME'\.mo$\):%lang(\2) \1\2\3:
@@ -114,8 +126,8 @@ s:^\([^%].*\)::
 
 find $TOP_DIR -type f|sed '
 s:'$TOP_DIR'::
-'$NO_ALL_NAME$GNOME's:\(.*/omf/'$NAME'/'$NAME'-\([^/.]\+\).omf\):%lang(\2) \1:
-'$ALL_NAME$GNOME's:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\).omf\):%lang(\2) \1:
+'$NO_ALL_NAME$GNOME's:\(.*/omf/'$NAME'/'$NAME'-\([^/.]\+\)\.omf\):%lang(\2) \1:
+'$ALL_NAME$GNOME's:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:
 s:^[^%].*::
 s:%lang(C) ::
 /^$/d'  $MO_NAME
@@ -130,6 +142,29 @@ s:%lang(C) ::
 s:%lang(C) ::
 /^$/d'  $MO_NAME
 
+find $TOP_DIR -type f -o -type l|sed '
+s:'$TOP_DIR'::
+'$NO_ALL_NAME$QT's:\(.*/'$NAME'_\([^/.]\+\)\.qm$\):%lang(\2) \1:
+'$ALL_NAME$QT's:\(.*[/_]\([^/_]\+\)\.qm$\):%lang(\2) \1:
+s:^[^%].*::
+s:%lang(C) ::
+/^$/d'  $MO_NAME
+
+find $TOP_DIR -type d|sed '
+s:'$TOP_DIR'::
+'$ALL_NAME$MAN's:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\)::
+'$ALL_NAME$MAN's:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1:
+s:^\([^%].*\)::
+s:%lang(C) ::
+/^$/d'  $MO_NAME
+
+find $TOP_DIR -type f -o -type l|sed '
+s:'$TOP_DIR'::
+'$NO_ALL_NAME$MAN's:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'$NAME'\.[a-z0-9].*\):%lang(\2) \1:
+s:^\([^%].*\)::
+s:%lang(C) ::
+/^$/d'  $MO_NAME
+
 if ! grep -q / $MO_NAME; then
 	echo No translations found for ${NAME} in ${TOP_DIR}
 	exit 1
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] changelog truncating

2007-08-30 Thread Ville Skyttä
On Thursday 30 August 2007, seth vidal wrote:
 Hi,
  Would it be possible to add an option to the specfile parser or to
 rpmbuild that would tell it to truncate the changelogs included in the
 package last N entries? It would default to including them all but give
 us the option of clipping off the really old ones just eating up space
 on mirrors and in repodata.

That would clip it off the actual packages too, no?

 Thoughts?

If metadata size is the concern, truncating it in createrepo would sound 
better to me.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] Pruning self-dependencies?

2007-07-04 Thread Ville Skyttä
On Monday 02 July 2007, Adam Jackson wrote:
 On Mon, 2007-07-02 at 21:50 +0300, Ville Skyttä wrote:
  As for how many dependencies this would eliminate, running some quick
  queries [0] against the Fedora primary sqlite metadata database told me
  it'd be about 7.3% of all dependencies (9246/126066).  This is inaccurate
  (no versions in dependencies taken into account etc) but I think it
  should be the correct order of magnitude.

 Of those, how many are used as Requires: from other packages?

I don't know, but... why?  I'm not sure how that's related to pruning 
self-Requires; I can see how it could relate to reducing the number of 
Provides but that's a different beast, and a much tougher one.
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint