- updated to 0.7.3beta2

- updated opt patch, removed obsolete po,am,gtk24_link patches

Changed files:
    denemo.spec -> 1.34

diff --git a/denemo.spec b/denemo.spec
index e4b94f0a3a9fdb784d6f7e493668f2fac2988ae0..a322a305322f87f5f85eb581397006dbaeaf1d19 100644 (file)
--- a/denemo.spec
+++ b/denemo.spec
@@ -1,37 +1,27 @@
-#
-# Conditional build:
-%bcond_without alsa    # without ALSA support
-%bcond_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.7.2a
-Release:       2
+Version:       0.7.3
+%define        bver    beta2
+Release:       0.%{bver}.1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/denemo/%{name}-%{version}.tar.gz
-# Source0-md5: 2d57e4d660e13eb6e476104c788046af
+Source0:       http://dl.sourceforge.net/denemo/%{name}-%{version}%{bver}.tar.gz
+# Source0-md5: 05baa26c359c388a2be280bf5aff048b
 Patch0:                %{name}-opt.patch
-Patch1:                %{name}-po.patch
-Patch2:                %{name}-am.patch
-Patch3:                %{name}-gtk24_link.patch
 URL:           http://denemo.sourceforge.net/
-%{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-%{?with_gtk1:BuildRequires:    gtk+-devel >= 1.2.0}
-%{!?with_gtk1:BuildRequires:   gtk+2-devel >= 1:2.0.0}
+BuildRequires: gtk+2-devel >= 2:2.6.0
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.0.0
 #BuildRequires:        niffsdk-devel
-%{!?with_gtk1:BuildRequires:   pkgconfig}
+BuildRequires: pkgconfig
 Requires:      TiMidity++
-Requires:      lilypond
+Requires:      lilypond >= 2.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautocompressdoc      *.ly
-
 %description
 Denemo is a graphical music notation program written in C with GTK+.
 
@@ -59,14 +49,10 @@ Header files for denemo plugins development.
 Pliki nag³ówkowe do tworzenia wtyczek dla denemo.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{bver}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-%{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -75,7 +61,6 @@ Pliki nag
 CFLAGS="%{rpmcflags} %{?debug:-DDEBUG}"
 %configure \
        --disable-static \
-       %{!?with_gtk1:--enable-gtk2} \
        --with-plugins=analysis
 # ,niff - but it's incomplete (no interface between niff and denemo)
 
@@ -97,11 +82,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS DESIGN GOALS NEWS README TODO examples/*.ly
+%doc AUTHORS ChangeLog DESIGN* GOALS NEWS README* TODO
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %dir %{_libdir}/denemo
 %attr(755,root,root) %{_libdir}/denemo/libanalyse.so*
+%{_sysconfdir}/denemoui.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/denemo.conf
 
 %files devel
 %defattr(644,root,root,755)