diff --git a/tkimg-build.patch b/tkimg-build.patch index 28ee4a3..b3dbd24 100644 --- a/tkimg-build.patch +++ b/tkimg-build.patch @@ -1,50 +1,20 @@ -diff -ur tkimg-1.3/Makefile.in tkimg-1.3.new/Makefile.in ---- tkimg-1.3/Makefile.in 2007-10-18 13:12:52.000000000 +0200 -+++ tkimg-1.3.new/Makefile.in 2007-10-18 15:19:08.000000000 +0200 -@@ -117,33 +117,35 @@ - here=`pwd` && \ - cd $$sub && \ - $(MAKE) install \ -- exec_prefix=$$here/Img/exec_prefix \ -- prefix=$$here/Img/prefix \ -- pkglibdir=$$here/Img/exec_prefix/lib/Img \ -- libdir=$$here/Img/exec_prefix/lib \ -+ exec_prefix=$$here/Img/$(exec_prefix) \ -+ prefix=$$here/Img/$(prefix) \ -+ pkglibdir=$$here/Img/$(libdir)/Img \ -+ includedir=$(DESTDIR)$(includedir) \ -+ libdir=$$here/Img/$(libdir) \ +diff -ur tkimg-20071018/Makefile.in tkimg-20071018.new/Makefile.in +--- tkimg-20071018/Makefile.in 2007-10-13 01:39:51.000000000 +0200 ++++ tkimg-20071018.new/Makefile.in 2007-12-08 11:06:45.000000000 +0100 +@@ -121,6 +121,7 @@ + prefix=$$here/Img/prefix \ + pkglibdir=$$here/Img/exec_prefix/lib/Img \ + libdir=$$here/Img/exec_prefix/lib \ ++ includedir=$$here/Img/prefix/include \ DESTDIR= \ || exit $$? && \ cd $$here && \ -- cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \ -+ cat Img/$(libdir)/Img/pkgIndex.tcl >> pkgIndex.tcl ; \ - done -- mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl -- for p in Img/exec_prefix/lib/*.sh ; do \ -+ mkdir -p $(DESTDIR)$(libdir)/Img -+ mv pkgIndex.tcl $(DESTDIR)$(libdir)/Img/pkgIndex.tcl -+ for p in Img/$(libdir)/*.sh ; do \ - sed -e 's#$(libdir)/[^/ ]*\([/ ]\)#$(LIB_RUNTIME_DIR)\1#' \ - $$p > $$p.1 && mv -f $$p.1 $$p ; \ - done - - install: collate - mkdir -p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR) -- for p in Img/exec_prefix/lib/Img/* ; do \ -+ for p in Img/$(libdir)/Img/* ; do \ - $(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)/`basename $$p` ; \ - done - mkdir -p $(INSTALL_ROOT)$(libdir) -- for p in Img/exec_prefix/lib/*.sh ; do \ -+ for p in Img/$(libdir)/*.sh ; do \ - $(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(libdir)/`basename $$p` ; \ - done -- if [ -n "`ls Img/prefix/include`" ]; then \ -+ if [ -n "`ls Img/$(prefix)/include`" ]; then \ +@@ -144,7 +145,7 @@ + if [ -n "`ls Img/prefix/include`" ]; then \ mkdir -p $(INSTALL_ROOT)$(includedir) && \ -- for p in Img/prefix/include/* ; do \ -+ for p in Img/$(prefix)/include/* ; do \ - $(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(includedir)/`basename $$p` ; \ + for p in Img/prefix/include/* ; do \ +- $(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(includedir)/`basename $$p` ; \ ++ $(INSTALL_DATA) $$p $(INSTALL_ROOT)$(includedir)/`basename $$p` ; \ done; fi + diff --git a/tkimg.spec b/tkimg.spec index 618f951..d99c51c 100644 --- a/tkimg.spec +++ b/tkimg.spec @@ -1,6 +1,6 @@ Name: tkimg Version: 1.3 -Release: 0.4.20071018svn%{?dist} +Release: 0.5.20071018svn%{?dist} Summary: More Image Formats for Tk Group: Development/Libraries @@ -43,13 +43,16 @@ This are the header files needed to develop a %{name} application %patch1 -p1 %build -%configure --disable-static +%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -fr %{buildroot} -%{__make} DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} install -chmod -R 755 %{buildroot}/%{_libdir}/* +%{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install +# Fixing some permissions +find %{buildroot}/%{_libdir} -name "*.sh" |xargs chmod 644 +find %{buildroot}/%{_libdir} -name "*.tcl" |xargs chmod 644 +find %{buildroot}/%{_libdir} -name "*.so" |xargs chmod 755 # Make library links %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf @@ -65,10 +68,8 @@ echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ %defattr(-,root,root,-) %doc README %config(noreplace) %{_sysconfdir}/ld.so.conf.d/* -%{_sysconfdir}/ld.so.conf.d/* %{_libdir}/*.sh %{_libdir}/Img1.3 -%exclude %{_libdir}/Img %exclude %{_libdir}/Img1.3/*.a %files devel @@ -76,6 +77,9 @@ echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ %{_includedir}/* %changelog +* Sat Nov 08 2007 Sergio Pascual 1.3-0.5.20071018svn +- Build patch simplified + * Mon Oct 29 2007 Sergio Pascual 1.3-0.4.20071018svn - Giving instructions to duplicate my checkout