summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Gołębiowski2011-10-03 11:38:13 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit890a744d842fd29a04d26ccbf095f1be225a0fd4 (patch)
tree1ef1da97f8fd83e9afebae75825b5d7e201413c1
parent21e85978fb38f4c7b97d2ad440359ce041f865ba (diff)
downloadreglookup-890a744d842fd29a04d26ccbf095f1be225a0fd4.zip
reglookup-890a744d842fd29a04d26ccbf095f1be225a0fd4.tar.gz
- updated to 1.0.1auto/th/reglookup-1_0_1-1
Changed files: reglookup-paths.patch -> 1.2 reglookup.spec -> 1.6
-rw-r--r--reglookup-paths.patch32
-rw-r--r--reglookup.spec4
2 files changed, 18 insertions, 18 deletions
diff --git a/reglookup-paths.patch b/reglookup-paths.patch
index 3ef1999..98bc851 100644
--- a/reglookup-paths.patch
+++ b/reglookup-paths.patch
@@ -1,6 +1,6 @@
--- reglookup-src-1.0.0/SConstruct~ 2011-06-13 04:27:42.000000000 +0200
+++ reglookup-src-1.0.0/SConstruct 2011-06-20 09:48:52.902314648 +0200
-@@ -44,18 +44,33 @@
+@@ -46,20 +46,34 @@
# Installation
prefix='/usr/local/'
@@ -11,16 +11,6 @@
+mandir=prefix + 'man'
if 'PREFIX' in os.environ:
prefix = os.environ['PREFIX']+'/'
--
--install_items = [prefix+'bin',
-- prefix+'lib',
-- prefix+'include/regfi',
-- prefix+'man']
--
--env.Install(prefix+'bin', [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
--env.Install(prefix+'lib', [libregfi, libregfi_static])
--env.Install(prefix+'include/regfi', Glob('include/*.h'))
--env.Install(prefix+'man/man1', [man_reglookup, man_reglookup_recover,
+if 'DESTDIR' in os.environ:
+ destdir = os.environ['DESTDIR']
+if 'BINDIR' in os.environ:
@@ -31,19 +21,29 @@
+ includedir = os.environ['INCLUDEDIR']
+if 'MANDIR' in os.environ:
+ mandir = os.environ['MANDIR']
-+
+
+-install_items = [prefix+'bin',
+- prefix+'lib',
+- prefix+'include/regfi',
+- prefix+'man']
+install_items = [destdir + bindir,
-+ destdir + libdir,
++ destdir + libdir,
+ destdir + includedir + '/regfi',
-+ destdir + mandir + '/man1']
-+
++ destdir + mandir]
+
+-env.Install(prefix+'bin', [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
+-libinstall = env.Install(prefix+'lib', [libregfi, libregfi_static])
+-env.Install(prefix+'include/regfi', Glob('include/*.h'))
+-env.Install(prefix+'man/man1', [man_reglookup, man_reglookup_recover,
+env.Install(destdir + bindir, [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
-+env.Install(destdir + libdir, [libregfi, libregfi_static])
++libinstall = env.Install(destdir + libdir, [libregfi, libregfi_static])
+env.Install(destdir + includedir + '/regfi', Glob('include/*.h'))
+env.Install(destdir + mandir + '/man1', [man_reglookup, man_reglookup_recover,
man_reglookup_timeline])
+-env.AddPostAction(libinstall, 'ldconfig')
if sys.version_info[0] == 2:
+ install_items.append('pyregfi2-install.log')
@@ -63,7 +76,7 @@
env.Command('pyregfi2-install.log', ['python/pyregfi/__init__.py',
'python/pyregfi/structures.py',
diff --git a/reglookup.spec b/reglookup.spec
index 3a5491c..3432bca 100644
--- a/reglookup.spec
+++ b/reglookup.spec
@@ -1,12 +1,12 @@
Summary: small utility for querying NT/2K/XP/2K3/Vista registries
Summary(pl.UTF-8): proste narzędzie do odpytywania rejestrów NT/2K/XP/2K3/Vista
Name: reglookup
-Version: 1.0.0
+Version: 1.0.1
Release: 1
License: GPL v3
Group: Applications
Source0: http://projects.sentinelchicken.org/data/downloads/%{name}-src-%{version}.tar.gz
-# Source0-md5: 1fb1eea7435d368a91ade8c4016b5be6
+# Source0-md5: c451c2dba904db8ae5b0531ca303e322
Patch0: %{name}-paths.patch
Patch1: %{name}-soname.patch
URL: http://projects.sentinelchicken.org/reglookup/