octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: octave packages


From: David Bateman
Subject: Re: octave packages
Date: Wed, 26 Sep 2007 11:17:16 +0200
User-agent: Thunderbird 1.5.0.7 (X11/20060921)

David Bateman wrote:
> Orion Poplawski wrote:
>   
>> David Bateman wrote:
>>     
>>> Any feedback on my latest iteration of the patches?
>>>       
>> Looking good at the moment.  I've submitted a packaging draft to the
>> Fedora packaging committee:
>>
>> http://fedoraproject.org/wiki/PackagingDrafts/Octave
>>
>> We'll see how that goes.
>>
>>
>>     
>
>
> I had a few other issues once I actually tested what I sent, I'll send
> an updated octave-forge patch later this morning..
>
> D.
>
>   
My remaining issue with the previous patch I proposed was that the "make
install" target of the octave-forge makefile will still configure and
attempt to build the files (even though they are already built by the
"make all" target) as the src/ directory is saved in the binary package.
Therefore we need to keep some of the previous patch, leaving src/*.oct,
src/*.mex and the "src/FILES" files in place while removing all of the
other files in src/ to create a real binary package. The attached patch
does this and adds the "libexec" files to the octave-forge rpm target..

Orion, once you have an accepted octave-forge package for fedora it
would make sense to propagate the changes to the SPEC file you needed
back to octave-forge...

Regards
David


-- 
David Bateman                                address@hidden
Motorola Labs - Paris                        +33 1 69 35 48 04 (Ph) 
Parc Les Algorithmes, Commune de St Aubin    +33 6 72 01 06 33 (Mob) 
91193 Gif-Sur-Yvette FRANCE                  +33 1 69 35 77 01 (Fax) 

The information contained in this communication has been classified as: 

[x] General Business Information 
[ ] Motorola Internal Use Only 
[ ] Motorola Confidential Proprietary

*** ./admin/rpm_template.in.orig2       2007-09-26 09:47:45.094844869 +0200
--- ./admin/rpm_template.in     2007-09-25 22:20:48.545263936 +0200
***************
*** 55,60 ****
--- 55,61 ----
  %files
  %defattr(-,root,root)
  %{_datadir}/octave/packages/*
+ %{_libexecdir}/octave/packages/*
  
  %changelog
  # Changelog for packages rebuilt on stable releases (leave it first):
*** ./packages/package_Makefile.in.orig2        2007-09-26 09:49:46.385420975 
+0200
--- ./packages/package_Makefile.in      2007-09-25 22:17:32.788023560 +0200
***************
*** 21,38 ****
        @if [ -d src ]; then \
          cd src; \
          if [ -e FILES ]; then \
!           files=`cat FILES`; \
          else \
!           files=`ls *.mex *.oct 2> /dev/null`; \
          fi; \
!         if [ ! -d ../inst ]; then \
!           mkdir ../inst; \
!         fi; \
!         cp -rf $$files ../inst; \
!         cd ../; \
!       fi; \
!       cd ../; \
!       tar --exclude='$(PKGDIR)/src' -czf $(PACKAGE) $(PKGDIR);
  
  install:
        @cd ../; \
--- 21,48 ----
        @if [ -d src ]; then \
          cd src; \
          if [ -e FILES ]; then \
!            keepfiles=`cat FILES`; \
          else \
!            keepfiles=`ls *.mex *.oct 2> /dev/null`; \
          fi; \
!         allfiles=`ls 2> /dev/null`; \
!         for _file in $$allfiles; do \
!           if test "$$_file" = "FILES"; then \
!             continue; \
!           fi; \
!           keep="no"; \
!           for _file2 in $$keepfiles; do \
!             if test "$$_file" = "$$_file2"; then \
!               keep="yes"; \
!               continue; \
!             fi; \
!           done; \
!           if test "$$keep" = "no"; then \
!             rm $$_file; \
!           fi; \
!         done; \
!         cd ../../; tar -czf $(PACKAGE) $(PKGDIR); \
!       fi
  
  install:
        @cd ../; \
***************
*** 43,53 ****
          pkgdir=`octave -H -q --no-site-file --eval 
"warning('off','all');pkg('install','$(PACKAGE)');l=pkg('list');disp(l{cellfun(@(x)strcmp(x.name,'$(PKG)'),l)}.dir);$$stripcmd;"`;
 \
        else \
          shareprefix=$(DESTDIR)/`octave -H -q --no-site-file --eval 
"disp(fullfile(OCTAVE_HOME(),'share','octave'));"`; \
          octprefix=$$shareprefix/packages; \
          if [ ! -e $$octprefix ]; then \
            mkdir -p $$octprefix; \
          fi; \
!         pkgdir=`octave -H -q --no-site-file --eval 
"warning('off','all');pkg('prefix','$$octprefix');pkg('global_list',fullfile('$$shareprefix','octave_packages'));pkg('local_list',fullfile('$$shareprefix','octave_packages'));pkg('install','$(PACKAGE)');l=pkg('list');disp(l{cellfun(@(x)strcmp(x.name,'$(PKG)'),l)}.dir);$$stripcmd;"`;
 \
        fi; \
        if [ "X${DISTPKG}X" != "XX" ]; then \
          if [ -e $$pkgdir/packinfo/on_uninstall.m ]; then \
--- 53,68 ----
          pkgdir=`octave -H -q --no-site-file --eval 
"warning('off','all');pkg('install','$(PACKAGE)');l=pkg('list');disp(l{cellfun(@(x)strcmp(x.name,'$(PKG)'),l)}.dir);$$stripcmd;"`;
 \
        else \
          shareprefix=$(DESTDIR)/`octave -H -q --no-site-file --eval 
"disp(fullfile(OCTAVE_HOME(),'share','octave'));"`; \
+         libexecprefix=$(DESTDIR)/`octave -H -q --no-site-file --eval 
"disp(fullfile(octave_config_info('libexecdir'),'octave'));"`; \
          octprefix=$$shareprefix/packages; \
+         archprefix=$$libexecprefix/packages; \
          if [ ! -e $$octprefix ]; then \
            mkdir -p $$octprefix; \
          fi; \
!         if [ ! -e $$archprefix ]; then \
!           mkdir -p $$archprefix; \
!         fi; \
!         pkgdir=`octave -H -q --no-site-file --eval 
"warning('off','all');pkg('prefix','$$octprefix','$$archprefix');pkg('global_list',fullfile('$$shareprefix','octave_packages'));pkg('local_list',fullfile('$$shareprefix','octave_packages'));pkg('install','$(PACKAGE)');l=pkg('list');disp(l{cellfun(@(x)strcmp(x.name,'$(PKG)'),l)}.dir);$$stripcmd;"`;
 \
        fi; \
        if [ "X${DISTPKG}X" != "XX" ]; then \
          if [ -e $$pkgdir/packinfo/on_uninstall.m ]; then \

reply via email to

[Prev in Thread] Current Thread [Next in Thread]