[non-daw] Update source, build new sub-packages

Tue Sep 3 18:34:32 UTC 2013

commit 7bd22b4294c2797138ba2065b2eee2974f4ee1ba
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue Sep 3 20:34:13 2013 +0200

    Update source, build new sub-packages

 .gitignore             |    1 +
 non-daw-desktop.patch  |    2 +-
 non-daw-makefile.patch |   45 -------------------
 non-daw.spec           |  112 ++++++++++++++++++++++++++++++++++--------------
 non-snapshot.sh        |   11 +++--
 sources                |    2 +-
 6 files changed, 89 insertions(+), 84 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1db5b9d..4624953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
index 6e187d4..4f79787 100644
--- a/non-daw-desktop.patch
+++ b/non-daw-desktop.patch
@@ -11,4 +11,4 @@ diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/tim
  Type=Application
  Icon=non-daw
 -Categories=Application;AudioVideo;Audio;
-+Categories=Application;AudioVideo;Audio;X-Jack;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
index f25d5e6..bfd4dda 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,18 +1,19 @@
 Name:           non-daw
 Version:        1.1.0
-Release:        0.4.gitae6b78cf%{?dist}
+Release:        0.5.git9fba8a8%{?dist}
 Summary:        A digital audio workstation for JACK
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://%{name}.tuxfamily.org/
-Source0:        non-daw-20121013-git61addce.tar.bz2
-# script to create source tarball from git
+URL:            http://non.tuxfamily.org/
+Source0:        non-daw-20130902-git9fba8a8.tar.bz2
 # sh non-snapshot.sh (rev>
 Source1:        non-snapshot.sh
-Patch0:         non-daw-makefile.patch
+# notified upstream of the following along with incorrect FSF address headers
 Patch1:         non-daw-desktop.patch
 
+BuildRequires:  non-ntk-devel
+BuildRequires:  non-ntk-fluid
 BuildRequires:  liblo-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  fltk-fluid
@@ -22,38 +23,53 @@ BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  imake
 BuildRequires:  libXpm-devel
+BuildRequires:  ladspa-devel
+BuildRequires:  liblrdf-devel
 
 %description
 Non-daw is a digital audio workstation for JACK
 
+%package -n non-mixer
+Summary:        A digital audio mixer for JACK
+Group:          Applications/Multimedia
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary:        A session manager for JACK
+Group:          Applications/Multimedia
+Obsoletes:      non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary:        A MIDI sequencer for JACK
+Group:          Applications/Multimedia
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI 
+sequencer
+
 %prep
-%setup -q -n non-daw-20121013
-%patch0 -p1
-%patch1 -p1
-sed -i -e 's|src/timeline $(prefix)/bin/non-daw|src/timeline $(DESTDIR)$(prefix)/bin/non-daw|' timeline/makefile.inc
-sed -i -e 's|@ $(CXX)|$(CXX) %optflags|' \
-  scripts/Makefile 
+%setup -q -n non-daw-20130902
+sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
+ wscript
 
 %build
-cd nonlib
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags} 
-cd ../FL
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags} 
-cd ../timeline
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags} 
+CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-debug
+./waf -j4 -v 
 
 %install 
-cd timeline
-mkdir -p %{buildroot}%{_bindir}
-export DESTDIR=%{buildroot}
-make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
-%if 0%{?fedora} < 20
-mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
-%endif
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+    sed -i -e 's|\/usr\/bin\/||' $i
+    desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
 
 %post 
 update-desktop-database -q
@@ -71,13 +87,45 @@ fi
 
 %files
 %doc COPYING
+%{_bindir}/import*
 %{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/pixmaps/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_bindir}/jackpatch
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
 
 %changelog
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it at gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
 * Mon Aug 12 2013 Brendan Jones <brendan.jones.it at gmail.com> 1.1.0-0.4.gitae6b78cf
 - Unversioned doc dir changes
 
diff --git a/non-snapshot.sh b/non-snapshot.sh
index 537996d..df91616 100644
--- a/non-snapshot.sh
+++ b/non-snapshot.sh
@@ -16,16 +16,17 @@ cleanup() {
 
 unset CDPATH
 pwd=$(pwd)
-name=non-daw
-version=20121013
+name=non
+version=20130520
 
 pushd "$tmp" >/dev/null
 echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/daw.git $name-$version |tee $name.stdout
-ls
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
 pushd $name-$version
+# grab submodule 
 git reset --hard $1
-rm -rf .git
+git clone git://git.tuxfamily.org/gitroot/non/fltk.git lib/ntk 
+rm -rf lib/ntk/.git* .git*
 popd
 echo "Fetched git revision: $1"
 rm -f $name.stdout
diff --git a/sources b/sources
index 040c124..c2b4cab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb624e8750dfda430ed1edeec14d9e0c  non-daw-20121013-git61addce.tar.bz2
+7322bf08e70c076ab7a4b016c8c2e5a0  non-daw-20130902-git9fba8a8.tar.bz2
