From 39a47d9b18f2440bdd2c712aa0fdc2b80976f8ce Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 9 May 2003 16:39:53 +0000 Subject: [PATCH] - updated to 0.7.1, build for gtk+2 by default - removed obsolete libxml2 patch, added opt patch - added -devel package Changed files: denemo-libxml2.patch -> 1.2 denemo-opt.patch -> 1.1 denemo.spec -> 1.21 --- denemo-libxml2.patch | 46 ------------------------------------------ denemo-opt.patch | 22 ++++++++++++++++++++ denemo.spec | 48 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 64 insertions(+), 52 deletions(-) delete mode 100644 denemo-libxml2.patch create mode 100644 denemo-opt.patch diff --git a/denemo-libxml2.patch b/denemo-libxml2.patch deleted file mode 100644 index 417a549..0000000 --- a/denemo-libxml2.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- denemo-0.6.0/exportxml.c.orig Tue May 28 09:58:55 2002 -+++ denemo-0.6.0/exportxml.c Wed Jul 24 23:07:35 2002 -@@ -15,7 +15,7 @@ - #include - - /* libxml includes: for libxml2 this should be */ --#include -+#include - - - #define XML_COMPRESSION_RATIO 3 ---- denemo-0.6.0/exportxml.h.orig Tue Jun 26 10:04:47 2001 -+++ denemo-0.6.0/exportxml.h Wed Jul 24 23:10:17 2002 -@@ -14,7 +14,7 @@ - #include - - /* libxml includes: for libxml2 this should be */ --#include -+#include - - - /* ---- denemo-0.6.0/importxml.c.orig Tue May 28 09:58:56 2002 -+++ denemo-0.6.0/importxml.c Wed Jul 24 23:17:50 2002 -@@ -18,8 +18,8 @@ - #include - - /* libxml includes: for libxml2 this should be */ --#include --#include -+#include -+#include - - - /* Defines for making traversing XML trees easier */ ---- denemo-0.6.0/importxml.h.orig Tue Jun 26 10:07:19 2001 -+++ denemo-0.6.0/importxml.h Wed Jul 24 23:18:00 2002 -@@ -14,7 +14,7 @@ - #include - - /* libxml includes: for libxml2 this should be */ --#include -+#include - - - /* diff --git a/denemo-opt.patch b/denemo-opt.patch new file mode 100644 index 0000000..5a044f0 --- /dev/null +++ b/denemo-opt.patch @@ -0,0 +1,22 @@ +--- denemo-0.7.1/configure.in.orig 2003-03-24 19:27:51.000000000 +0100 ++++ denemo-0.7.1/configure.in 2003-05-09 08:40:55.000000000 +0200 +@@ -36,8 +36,8 @@ + ) + if test "x$usegtk2" = "xyes"; then + PKG_CHECK_MODULES(DENEMO, gtk+-2.0 >= 2.0.3) +- CFLAGS="$DENEMO_CFLAGS" +- LIBS="$DENEMO_LIBS" ++ CFLAGS="$CFLAGS $DENEMO_CFLAGS" ++ LIBS="$LIBS $DENEMO_LIBS" + else + AM_PATH_GTK(1.2.0, [LIBS="$LIBS $GTK_LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" +@@ -190,7 +190,7 @@ + AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) + +-CXXFLAGS="$CFLAGS -g -Wall -O2" ++CXXFLAGS="$CFLAGS" + + AC_OUTPUT([ + Makefile diff --git a/denemo.spec b/denemo.spec index 7b35015..eaec4a6 100644 --- a/denemo.spec +++ b/denemo.spec @@ -1,17 +1,26 @@ +# +# Conditional build: +# _without_alsa - without ALSA support +# _with_gtk1 - use GTK+ 1.2 instead of GTK+ 2 +# Summary: Gtk frontend for GNU lilypond Summary(pl): Frontend Gtk na GNU lilypond Name: denemo -Version: 0.6.0 +Version: 0.7.1 Release: 1 License: GPL Group: X11/Applications/Sound Source0: http://dl.sourceforge.net/denemo/%{name}-%{version}.tar.gz -Patch0: %{name}-libxml2.patch +Patch0: %{name}-opt.patch URL: http://denemo.sourceforge.net/ +%{!?_without_alsa:BuildRequires: alsa-lib-devel >= 0.9.0} BuildRequires: autoconf BuildRequires: automake -BuildRequires: gtk+-devel >= 1.2.0 -BuildRequires: libxml2-devel +%{?_with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} +%{!?_with_gtk1:BuildRequires: gtk+2-devel >= 2.0.0} +BuildRequires: libtool +BuildRequires: libxml2-devel >= 2.0.0 +%{!?_with_gtk1:BuildRequires: pkgconfig} Requires: TiMidity++ Requires: lilypond BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -30,17 +39,35 @@ Jest przeznaczony do u (http://www.cs.uu.nl/hanwen/lilypond/), ale mo¿e byæ zaadaptowany do innych celów zwi±zanych z muzyk±. +%package devel +Summary: Header files for denemo plugins development +Summary(pl): Pliki nag³ówkowe do tworzenia wtyczek dla denemo +Group: Development/Libraries +# doesn't require base + +%description devel +Header files for denemo plugins development. + +%description devel -l pl +Pliki nag³ówkowe do tworzenia wtyczek dla denemo. + %prep %setup -q %patch -p1 %build -rm -f missing +%{?_without_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4} +%{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} CFLAGS="%{rpmcflags} %{?debug:-DDEBUG}" -%configure +%configure \ + %{!?_with_gtk1:--enable-gtk2} \ + --with-plugins=analysis +# from niffsdk needed for niff plugin + %{__make} %install @@ -50,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %find_lang %{name} +# no *.{la,a} for modules - shut up check-files +rm -f $RPM_BUILD_ROOT%{_libdir}/denemo/*.{la,a} + %clean rm -rf $RPM_BUILD_ROOT @@ -58,3 +88,9 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS DESIGN GOALS NEWS README TODO %attr(755,root,root) %{_bindir}/* %{_datadir}/%{name} +%dir %{_libdir}/denemo +%attr(755,root,root) %{_libdir}/denemo/libanalyse.so* + +%files devel +%defattr(644,root,root,755) +%{_includedir}/denemo -- 2.44.0