[weasel-commit] Source: kdepackage-kde3=20080705-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sat, 05 Jul 2008 07:36:13 -0400
================================
kdepackage-kde3:source=20080705-2 (previous: 20080705-1)
cvc rdiff kdepackage-kde3 -1 /weasel.rpath.org@wgl:2-qa/20080705-2
================================
20080705-2 Filip Brcic (brcha@xxxxxxx) Sat Jul 5 07:36:10 2008
fix conary
kdepackage-kde3.recipe: changed
Index: kdepackage-kde3.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- kdepackage-kde3.recipe /weasel.rpath.org@wgl:2-qa/20080705-1
+++ kdepackage-kde3.recipe /weasel.rpath.org@wgl:2-qa/20080705-2
@@ -33,6 +33,13 @@
r.macros.kdehtmldir = '%(oldDocdir)s/kde3'
r.macros.prefix = '/opt/kde3'
r.macros.sysconfdir += r.macros.prefix # /etc/opt/kde3
+
+ # Fix for conary macros ugliness:
+ r.macros.debugedit = '/usr/bin/debugedit'
+ r.macros.strip = '/usr/bin/eu-strip'
+ r.macros.strip_archive = '/usr/bin/strip -g'
+ r.macros.monodis = '/usr/bin/monodis'
+ r.macros.ruby = '/usr/bin/ruby'
r.Environment('QTDOCDIR', '%(oldDocdir)s/qt3/doc')
r.Environment('MOC', '%(oldBindir)s/moc-qt3')
@@ -94,7 +101,3 @@
r.CheckSonames(exceptions='%(libdir)s/libkdeinit_.*')
r.RemoveNonPackageFiles(exceptions='.*\.la')
r.DanglingSymlinks(exceptions='%(kdehtmldir)s/.*/.*/common')
-
-# # Before leaving things back to conary, prefix must be reset to /usr
-# # I am sure this is a bug...
-# r.macros.prefix = r.macros.oldPrefix
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: kdepackage-kde3=20080705-2
