diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a210e1e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/MUSIC-a78a8e2.tar.gz
diff --git a/0001-Enable-testsuite-and-extras-for-mpich2.patch b/0001-Enable-testsuite-and-extras-for-mpich2.patch
new file mode 100644
index 0000000..1c08579
--- /dev/null
+++ b/0001-Enable-testsuite-and-extras-for-mpich2.patch
@@ -0,0 +1,26 @@
+From 795f9d9312a6eb7e59c9e09b46d65d285b072825 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Fri, 19 Jul 2019 08:17:55 +0100
+Subject: [PATCH 1/3] Enable testsuite and extras for mpich2
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 3bd6569..9af1f59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,6 +58,9 @@ Please set them manually.])
+     if mpich2version >/dev/null 2>/dev/null; then
+        SYSGUESS=mpich2
+        AC_DEFINE(HAVE_MPICH2, 1, [Define to 1 if you have MPICH2.])
++       LAUNCHSTYLE=_mpirun
++       TESTDIR=testsuite
++       EXTRAS=extras
+     else
+        SYSGUESS=bgl
+     fi
+-- 
+2.21.0
+
diff --git a/0002-Make-python-bits-ourselves.patch b/0002-Make-python-bits-ourselves.patch
new file mode 100644
index 0000000..9073746
--- /dev/null
+++ b/0002-Make-python-bits-ourselves.patch
@@ -0,0 +1,30 @@
+From cb36c6977d57a9043e628dae8f035affc2d13d14 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Fri, 19 Jul 2019 10:44:23 +0100
+Subject: [PATCH 2/3] Make python bits ourselves
+
+---
+ pymusic/Makefile.am | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/pymusic/Makefile.am b/pymusic/Makefile.am
+index 1d383d9..6d63f1d 100644
+--- a/pymusic/Makefile.am
++++ b/pymusic/Makefile.am
+@@ -45,13 +45,5 @@ pybuffer_la_CXXFLAGS = \
+ 	$(PYBUFFER_CXXFLAGS) \
+ 	$(MPI_CXXFLAGS)
+ 
+-install-exec-hook:
+-	$(PYTHON) setup.py build \
+-	  --build-base=$(abs_builddir)/build install \
+-	  --prefix=$(DESTDIR)$(prefix) \
+-	  --install-lib=$(DESTDIR)$(pyexecdir) \
+-	  --install-scripts=$(DESTDIR)$(bindir) \
+-	  --install-data=$(DESTDIR)$(pkgdatadir)
+-
+ clean-local:
+ 	-rm -rf $(abs_builddir)/build
+-- 
+2.21.0
+
diff --git a/0003-Make-bundled-rudeconfig-also-follow-all-flags.patch b/0003-Make-bundled-rudeconfig-also-follow-all-flags.patch
new file mode 100644
index 0000000..e9dacc2
--- /dev/null
+++ b/0003-Make-bundled-rudeconfig-also-follow-all-flags.patch
@@ -0,0 +1,26 @@
+From 7d0f2dc4eb676600e9ecc5d38c11a3481eea75af Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Fri, 19 Jul 2019 10:44:36 +0100
+Subject: [PATCH 3/3] Make bundled rudeconfig also follow all flags
+
+---
+ rudeconfig/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rudeconfig/Makefile.am b/rudeconfig/Makefile.am
+index 06074b1..9039194 100644
+--- a/rudeconfig/Makefile.am
++++ b/rudeconfig/Makefile.am
+@@ -58,7 +58,8 @@ librudeconfig_la_SOURCES = src/AbstractData.cpp \
+ 	src/Writer.h \
+         src/SourceDest.h
+ 
+-librudeconfig_la_LDFLAGS = -version-info 5:1:2
++librudeconfig_la_LDFLAGS =  $(LDFLAGS) -version-info 5:1:2
++librudeconfig_la_CXXFLAGS = $(CXXFLAGS) $(CFLAGS)
+ 
+ #pkginclude_HEADERS = src/config.h
+ #pkgincludedir = $(includedir)/rude
+-- 
+2.21.0
+
diff --git a/MUSIC.spec b/MUSIC.spec
new file mode 100644
index 0000000..5828527
--- /dev/null
+++ b/MUSIC.spec
@@ -0,0 +1,399 @@
+# MUSIC depends on MPI for communication, so a non-MPI version is not being
+# built.
+# https://github.com/INCF/MUSIC/issues/55
+
+
+%global commit a78a8e2c90b07274db94265db75c320dbb01f9fb
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+# For debugging
+%bcond_without mpich
+%bcond_without openmpi
+
+%global lname music
+
+%global _description %{expand:
+MUSIC is an API allowing large scale neuron simulators using MPI internally to
+exchange data during runtime.  MUSIC provides mechanisms to transfer massive
+amounts of event information and continuous values from one parallel
+application to another.  Special care has been taken to ensure that existing
+simulators can be adapted to MUSIC.  In particular, MUSIC handles data transfer
+between applications that use different time steps and different data
+allocation strategies.
+
+This is the MUSIC pilot implementation.
+
+The two most important components built from this software distribution is the
+music library `libmusic.a' and the music utility `music'.  A MUSIC-aware
+simulator links against the C++ library and can be launched using mpirun
+together with the music utility as described below.  MUSIC can also be used
+from a C program using the API in music-c.h.
+
+MUSIC is distributed under the GNU General Public License v3.}
+
+
+Name:           MUSIC
+Version:        1.1.15
+Release:        3.20190717git%{shortcommit}%{?dist}
+Summary:        The MUltiSimulation Coordinator
+
+License:        GPLv3+
+URL:            https://github.com/INCF/%{name}/
+Source0:        https://github.com/INCF/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Patch0:         0001-Enable-testsuite-and-extras-for-mpich2.patch
+Patch1:         0002-Make-python-bits-ourselves.patch
+Patch2:         0003-Make-bundled-rudeconfig-also-follow-all-flags.patch
+
+# Bundled rudeconfig
+Provides:       bundled(rudeconfig) = 5.0.5-1
+
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  freeglut-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libtool
+BuildRequires:  patch
+BuildRequires:  hwloc-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-Cython
+# Currently bundles a modified version of rudeconfig which cannot be unbundled
+# until MUSIC upstream sends their changes upstream to rudeconfig.
+# https://github.com/INCF/MUSIC/issues/56
+# BuildRequires:  rudeconfig-devel
+
+%description %_description
+
+%package common
+Summary:    Architecture independent test and example files for %{name}
+BuildArch:  noarch
+
+%description common %_description
+
+%if %{with mpich}
+%package mpich
+Summary:        %{name} built with mpich
+BuildRequires:  mpich-devel
+BuildRequires:  rpm-mpi-hooks
+Requires:       mpich
+
+%description mpich %_description
+
+%package mpich-devel
+Summary:        %{name} built with mpich
+BuildRequires:  mpich-devel
+BuildRequires:  rpm-mpi-hooks
+Requires:       mpich
+Requires:       %{name}-mpich%{?_isa} = %{version}-%{release}
+
+%description mpich-devel
+Development files for %{name} built with MPICH.
+
+%package -n python3-%{name}-mpich
+Summary:        Python3 support for %{name} built with mpich
+BuildRequires:  mpich-devel
+BuildRequires:  rpm-mpi-hooks
+BuildRequires:  python3-mpi4py-mpich
+Requires:       python3-mpi4py-mpich
+Requires:       mpich
+Requires:       %{name}-mpich%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{name}-mpich}
+
+%description -n python3-%{name}-mpich %_description
+%endif
+
+%if %{with openmpi}
+%package openmpi
+Summary:        %{name} built with openmpi
+BuildRequires:  openmpi-devel
+BuildRequires:  rpm-mpi-hooks
+Requires:       openmpi
+
+%description openmpi %_description
+
+%package openmpi-devel
+Summary:        %{name} built with openmpi
+BuildRequires:  openmpi-devel
+BuildRequires:  rpm-mpi-hooks
+Requires:       openmpi
+Requires:       %{name}-openmpi%{?_isa} = %{version}-%{release}
+
+%description openmpi-devel
+Development files for %{name} built with MPICH.
+
+%package -n python3-%{name}-openmpi
+Summary:        Python3 support for %{name} built with openmpi
+BuildRequires:  openmpi-devel
+BuildRequires:  rpm-mpi-hooks
+BuildRequires:  python3-mpi4py-openmpi
+Requires:       python3-mpi4py-openmpi
+Requires:       openmpi
+Requires:       %{name}-openmpi%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{name}-openmpi}
+
+%description -n python3-%{name}-openmpi %_description
+%endif
+
+%prep
+%autosetup -c -n %{name}-%{commit} -N
+# Unable to use autosetup directly because we need three copies of the source
+# in here now
+# Apply patches
+pushd %{name}-%{commit}
+%patch -p1 -P 0 1 2
+# on Fedora, we have mpichversion, not mpich2version
+sed -i 's|mpich2version|mpichversion|' configure.ac
+popd
+
+cp %{name}-%{commit}/LICENSE .
+cp %{name}-%{commit}/README .
+
+%if %{with mpich}
+    cp -a %{name}-%{commit} %{name}-%{commit}-mpich
+%endif
+
+%if %{with openmpi}
+    cp -a %{name}-%{commit} %{name}-%{commit}-openmpi
+%endif
+
+%build
+
+%global do_build %{expand:
+echo "** BUILDING $MPI_COMPILE_TYPE **"
+pushd %{name}-%{commit}$MPI_COMPILE_TYPE
+./autogen.sh &&
+%{set_build_flags}
+MPI_CXXFLAGS="$CXXFLAGS $(pkg-config --cflags $MPI_VARIANT)"
+MPI_CFLAGS="$CFLAGS $(pkg-config --cflags $MPI_VARIANT)"
+MPI_LDFLAGS="$LDFLAGS $(pkg-config --libs $MPI_VARIANT)"
+./configure MPI_CXXFLAGS="$MPI_CXXFLAGS" MPI_CFLAGS="$MPI_CFLAGS" MPI_LDFLAGS="$MPI_LDFLAGS" PYTHON="$PYTHON_BIN" \\\
+--disable-static \\\
+--prefix=$MPI_HOME \\\
+--libdir=$MPI_LIB \\\
+--includedir=$MPI_INCLUDE \\\
+--bindir=$MPI_BIN \\\
+--mandir=$MPI_MAN
+
+%make_build
+
+# Make python bits ourselves
+pushd pymusic
+%{py3_build}
+popd
+
+popd
+}
+
+
+# Mpich
+%if %{with mpich}
+%{_mpich_load}
+MPI_CXX="mpicxx"
+MPI_VARIANT="mpich"
+
+MPI_COMPILE_TYPE="-mpich"
+PYTHON_VERSION=3
+PYTHON_BIN="%{__python3}"
+%{do_build}
+
+%{_mpich_unload}
+%endif
+
+# Openmpi
+%if %{with openmpi}
+%{_openmpi_load}
+MPI_CXX="mpicxx"
+MPI_VARIANT="ompi-cxx"
+
+MPI_COMPILE_TYPE="-openmpi"
+PYTHON_VERSION=3
+PYTHON_BIN="%{__python3}"
+%{do_build}
+%{_openmpi_unload}
+%endif
+
+%install
+%global do_install %{expand:
+%make_install -C %{name}-%{commit}$MPI_COMPILE_TYPE
+mv $RPM_BUILD_ROOT/$MPI_HOME/lib/%{lname}-%{version}/* $RPM_BUILD_ROOT/$MPI_BIN/ -v && rm -vrf $RPM_BUILD_ROOT/$MPI_HOME/lib/%{lname}-%{version}
+for f in contsink eventcounter eventgenerator eventlogger eventselect eventsink eventsource messagesource music viewevents waveconsumer waveproducer clocksource constsource contdelay eventdelay launchtest multiport musicrun test_ag
+do
+    if [ -e  "$RPM_BUILD_ROOT/$MPI_BIN/$f" ]; then
+        echo "Renaming $f"
+        mv "$RPM_BUILD_ROOT/$MPI_BIN/$f" "$RPM_BUILD_ROOT/$MPI_BIN/$f$MPI_SUFFIX" -v
+    fi
+done
+# Delete script for tests
+rm -f "$RPM_BUILD_ROOT/$MPI_BIN/music_tests.sh"
+
+# Install python bits
+pushd %{name}-%{commit}$MPI_COMPILE_TYPE/pymusic
+%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT --install-lib=$MPI_PYTHON3_SITEARCH
+popd
+
+# Move other files to correct location also
+mv -v "$RPM_BUILD_ROOT/$MPI_HOME/lib/python%{python3_version}/site-packages/music/config" "$RPM_BUILD_ROOT/$MPI_PYTHON3_SITEARCH/%{lname}/"
+mv -v "$RPM_BUILD_ROOT/$MPI_HOME/%{_lib}/python%{python3_version}/site-packages/music/pymusic.so" "$RPM_BUILD_ROOT/$MPI_PYTHON3_SITEARCH/%{lname}"
+mv -v "$RPM_BUILD_ROOT/$MPI_HOME/%{_lib}/python%{python3_version}/site-packages/music/pybuffer.so" "$RPM_BUILD_ROOT/$MPI_PYTHON3_SITEARCH/%{lname}"
+
+# Delete the folders
+rm -vrf "$RPM_BUILD_ROOT/$MPI_HOME/lib/python%{python3_version}/site-packages/music"
+# If 64 bit, then we also need to delete this folder
+%if %{_lib} == "lib64"
+    rm -vrf "$RPM_BUILD_ROOT/$MPI_HOME/%{_lib}/python%{python3_version}/site-packages/music"
+%endif
+}
+
+
+# Mpich
+%if %{with mpich}
+%{_mpich_load}
+MPI_COMPILE_TYPE="-mpich"
+%{do_install}
+%{_mpich_unload}
+%endif
+
+# Openmpi
+%if %{with openmpi}
+%{_openmpi_load}
+MPI_COMPILE_TYPE="-openmpi"
+%{do_install}
+%{_openmpi_unload}
+%endif
+
+# Move arch independent examples and tests to datadir
+%if %{with mpich} || %{with openmpi}
+# Tests
+install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/%{lname}/
+mv $RPM_BUILD_ROOT/%{_libdir}/mpich/share/%{lname}-%{version}/tests $RPM_BUILD_ROOT/%{_datadir}/%{lname}/ || exit 0
+
+# Docs
+install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/doc/%{lname}/
+mv $RPM_BUILD_ROOT/%{_libdir}/mpich/share/%{lname}-%{version}/examples $RPM_BUILD_ROOT/%{_datadir}/doc/%{lname}/ || exit 0
+
+# Delete the folders
+rm -vrf $RPM_BUILD_ROOT/%{_libdir}/mpich/share || exit 0
+rm -vrff $RPM_BUILD_ROOT/%{_libdir}/openmpi/share || exit 0
+%endif
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+
+%files common
+%license LICENSE
+%{_datadir}/%{lname}
+%{_datadir}/doc/%{lname}
+
+
+%if %{with mpich}
+%files mpich
+%license LICENSE
+%doc README
+%{_libdir}/mpich/bin/contsink_mpich
+%{_libdir}/mpich/bin/eventcounter_mpich
+%{_libdir}/mpich/bin/eventgenerator_mpich
+%{_libdir}/mpich/bin/eventlogger_mpich
+%{_libdir}/mpich/bin/eventselect_mpich
+%{_libdir}/mpich/bin/eventsink_mpich
+%{_libdir}/mpich/bin/eventsource_mpich
+%{_libdir}/mpich/bin/messagesource_mpich
+%{_libdir}/mpich/bin/music_mpich
+%{_libdir}/mpich/bin/viewevents_mpich
+%{_libdir}/mpich/bin/waveconsumer_mpich
+%{_libdir}/mpich/bin/waveproducer_mpich
+%{_libdir}/mpich/bin/constsource_mpich
+%{_libdir}/mpich/bin/clocksource_mpich
+%{_libdir}/mpich/bin/contdelay_mpich
+%{_libdir}/mpich/bin/eventdelay_mpich
+%{_libdir}/mpich/bin/launchtest_mpich
+%{_libdir}/mpich/bin/multiport_mpich
+%{_libdir}/mpich/bin/musicrun_mpich
+%{_libdir}/mpich/bin/test_ag_mpich
+%{_libdir}/mpich/lib/libmusic.so.1
+%{_libdir}/mpich/lib/libmusic-c.so.1
+%{_libdir}/mpich/lib/libmusic.so.1.0.0
+%{_libdir}/mpich/lib/libmusic-c.so.1.0.0
+%{_mandir}/mpich-%{_arch}/man1/*
+
+%files mpich-devel
+%license LICENSE
+%doc README
+%{_includedir}/mpich*/%{lname}
+%{_includedir}/mpich*/%{lname}*.*
+%{_includedir}/mpich*/predict_rank-c.h
+%{_libdir}/mpich/lib/libmusic.so
+%{_libdir}/mpich/lib/libmusic-c.so
+
+%files -n python3-%{name}-mpich
+%license LICENSE
+%doc README
+%{_libdir}/python%{python3_version}/site-packages/mpich/%{lname}
+%{_libdir}/python%{python3_version}/site-packages/mpich/%{lname}-%{version}-py%{python3_version}.egg-info
+%endif
+
+%if %{with openmpi}
+%files openmpi
+%license LICENSE
+%doc README
+%{_libdir}/openmpi/bin/contsink_openmpi
+%{_libdir}/openmpi/bin/eventcounter_openmpi
+%{_libdir}/openmpi/bin/eventgenerator_openmpi
+%{_libdir}/openmpi/bin/eventlogger_openmpi
+%{_libdir}/openmpi/bin/eventselect_openmpi
+%{_libdir}/openmpi/bin/eventsink_openmpi
+%{_libdir}/openmpi/bin/eventsource_openmpi
+%{_libdir}/openmpi/bin/messagesource_openmpi
+%{_libdir}/openmpi/bin/music_openmpi
+%{_libdir}/openmpi/bin/viewevents_openmpi
+%{_libdir}/openmpi/bin/waveconsumer_openmpi
+%{_libdir}/openmpi/bin/waveproducer_openmpi
+%{_libdir}/openmpi/bin/constsource_openmpi
+%{_libdir}/openmpi/bin/clocksource_openmpi
+%{_libdir}/openmpi/bin/contdelay_openmpi
+%{_libdir}/openmpi/bin/eventdelay_openmpi
+%{_libdir}/openmpi/bin/launchtest_openmpi
+%{_libdir}/openmpi/bin/multiport_openmpi
+%{_libdir}/openmpi/bin/musicrun_openmpi
+%{_libdir}/openmpi/bin/test_ag_openmpi
+%{_libdir}/openmpi/lib/libmusic.so.1
+%{_libdir}/openmpi/lib/libmusic-c.so.1
+%{_libdir}/openmpi/lib/libmusic.so.1.0.0
+%{_libdir}/openmpi/lib/libmusic-c.so.1.0.0
+%{_mandir}/openmpi-%{_arch}/man1/*
+
+%files openmpi-devel
+%license LICENSE
+%doc README
+%{_includedir}/openmpi*/%{lname}
+%{_includedir}/openmpi*/%{lname}*.*
+%{_includedir}/openmpi*/predict_rank-c.h
+%{_libdir}/openmpi/lib/libmusic.so
+%{_libdir}/openmpi/lib/libmusic-c.so
+
+%files -n python3-%{name}-openmpi
+%license LICENSE
+%doc README
+%{_libdir}/python%{python3_version}/site-packages/openmpi/%{lname}
+%{_libdir}/python%{python3_version}/site-packages/openmpi/%{lname}-%{version}-py%{python3_version}.egg-info
+%endif
+
+%changelog
+* Tue Oct 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.1.15-3.20190717git78a8e2
+- Add bundled provides
+- Remove ldconfig scriptlets
+- Move arch independent bits to _datadir in separate sub-package
+
+* Mon Sep 09 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.1.15-2.20190717git78a8e2
+- Add hwloc dep
+
+* Fri Jul 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.1.15-2.20190717gita78a8e2
+- Build python ourselves
+- Bundle rudeconfig
+- Remove python 2 subpackage
+
+* Sat Oct 20 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0-1.20181020gita77e5787
+- Depend on packaged rudeconfig
+- Remove non MPI packages
+- Use macros
+- Put common files into separate sub package
+- Correct autosetup usage
+- Initial build
diff --git a/sources b/sources
new file mode 100644
index 0000000..ea314a7
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (MUSIC-a78a8e2.tar.gz) = 1c3ff6ac281b3b703e9803a4d505eca85a923bc88d5a001d6f23a7d7ae01ad89eb89309a27f82d8ef3c1202daf8706a741dcb1c62ec02b34452bc2bedc8e6db0