[phasex] Update to 0.12.0.dev-m1 Workaround DSO linking error

Orcan Ogetbil oget at fedoraproject.org
Mon Jan 16 21:16:44 UTC 2012


commit 13adf714d05c5b1f326caa9cfffb8e19816c8d0d
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Mon Jan 16 16:16:41 2012 -0500

    Update to 0.12.0.dev-m1
    Workaround DSO linking error

 .gitignore  |    1 +
 phasex.spec |   23 ++++++++++++-----------
 sources     |    2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c82475..c661304 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 phasex-0.12.0-pre1.tar.gz
+/phasex-dev-m1.tar.gz
diff --git a/phasex.spec b/phasex.spec
index cdfd85a..1a4f98f 100644
--- a/phasex.spec
+++ b/phasex.spec
@@ -1,21 +1,22 @@
 %global  desktop_vendor fedora
-%global prerel pre1
+%global prerel m1
+%global prerel_d dev-m1
 
 Name:  phasex
 Version: 0.12.0
-Release: 0.5.%{prerel}%{?dist}
+Release: 0.6.%{prerel}%{?dist}
 Summary: PHASEX -- Phase Harmonic Advanced Synthesis EXperiment
 Group:  Applications/Multimedia
 License: GPLv2
-URL:  http://sysex.net/phasex/
+URL:  https://github.com/disabled/phasex-dev
 
-Source0: http://sysex.net/phasex/%{name}-%{version}-%{prerel}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: https://github.com/downloads/disabled/phasex-dev/%{name}-%{prerel_d}.tar.gz
 
 BuildRequires: glibc-devel >= 2.3.0
 BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: jack-audio-connection-kit-devel >= 0.99.0
 BuildRequires: libICE-devel
+BuildRequires: lash-devel
 BuildRequires: libsamplerate-devel >= 0.1.2
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: perl
@@ -35,14 +36,14 @@ phaser, ADSR envelopes for amplifier and filter, realtime audio input
 processing capabilities, and more.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{prerel_d}
 
 # Upstream is notified via email for these two issues
 # Fix optflags
 sed -i -e 's|-O3.*"|%{optflags}"|' -e 's|-mtune=generic||' configure
 
 # Fix DSO linking
-sed -i -e 's|\(-lpthread\)|\1 -lX11|' configure
+sed -i -e 's|\(-lpthread\)|\1 -lX11 -lgmodule-2.0|' configure
 
 %build
 %configure \
@@ -53,7 +54,6 @@ sed -i -e 's|\(-lpthread\)|\1 -lX11|' configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for s in 16 22 32 48 ; do
@@ -85,11 +85,8 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/phasex
 %{_datadir}/phasex/
@@ -98,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/phasex-icon.png
 
 %changelog
+* Mon Jan 16 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.12.0-0.6.m1
+- Update to 0.12.0.dev-m1
+- Workaround DSO linking error
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-0.5.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index ba68651..48b2191 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-990d1ccad21afcc00f41d8c2f2874b3c  phasex-0.12.0-pre1.tar.gz
+24a59e992c55f0598891da7c57c55df5  phasex-dev-m1.tar.gz


More information about the scm-commits mailing list