On Jan 8, 2008 8:05 PM, Patrick Ale <patrick.ale at gmail.com> wrote:
> On Jan 8, 2008 5:09 PM, Patrick Ale <patrick.ale at gmail.com> wrote:
> I think I see what's going wrong. I am trying to fix it now.
> I will let you know if my theory works, if I can't fix I will contact
> you, this will prevent doing double work. You probably have other
> things to do as well anyway ;-)
It seems the patch in the repository was against glib-2.15.0 while the
spec file uses 2.15.1 now.
I made a new patch, or actually to be honest i took your patch looked
what you wanted to achieve and hacked my way around it ;-)
Can you guys review if what I did is acceptable?
--- glib-2.15.1/glib/Makefile.am.orig 2008-01-07 15:15:53.000000000 +0100
+++ glib-2.15.1/glib/Makefile.am 2008-01-08 20:12:17.192834071 +0100
@@ -326,12 +326,11 @@
install-exec-hook:
for sf in ${auto_config_binscripts} ; do \
- sed -i.bak \
+ sed \
-e '1,24s|^ *...@pkginstall_configvars_in24lines@| ${CONFIGVARS}|'
\
- -e '1,1s|#!/usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
- "$(DESTDIR)$(bindir)/$$sf" \
- || exit $$? \
- && rm -f "$(DESTDIR)$(bindir)/$$sf".bak ; \
+ -e -e '1,1s|#!/usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|'
"$(DESTDIR)$(bindir)/$$sf" > "$(DESTDIR)$(bindir)/$$sf.xx" || exit $$?
; \
+ mv "$(DESTDIR)$(bindir)/$$sf.xx" "$(DESTDIR)$(bindir)/$$sf" ; \
+ && rm -f "$(DESTDIR)$(bindir)/$$sf".bak ; \
done
endif
--
Patrick
