[portmidi] Fix multilib conflict RHBZ#831432

Wed Jun 13 03:27:50 UTC 2012

commit 70c469ccd999f9ecde7412639edf4a81e552c9a2
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Jun 12 23:27:47 2012 -0400

    Fix multilib conflict RHBZ#831432
    
    - Don't bulid PDF doc, as it causes another multilib conflict
    - Specfile cleanup. Drop old GCJ-Java and Python bits

 portmidi-no_date_footer.patch |   31 +++++++++++++++++++
 portmidi.spec                 |   65 ++++++++++-------------------------------
 2 files changed, 47 insertions(+), 49 deletions(-)
---

diff --git a/portmidi-no_date_footer.patch b/portmidi-no_date_footer.patch
new file mode 100644
index 0000000..24b04d5
--- /dev/null
+++ b/portmidi-no_date_footer.patch
@@ -0,0 +1,31 @@
+diff -rupN portmidi.old/Doxyfile portmidi/Doxyfile
+--- portmidi.old/Doxyfile	2009-01-02 15:16:17.000000000 -0500
++++ portmidi/Doxyfile	2012-06-12 22:45:25.821808644 -0400
+@@ -765,7 +765,7 @@ HTML_HEADER            =
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER            = 
++HTML_FOOTER            = no_date_footer.html
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+ # style sheet that is used by each HTML page. It can be used to 
+@@ -941,7 +941,7 @@ TREEVIEW_WIDTH         = 200
+ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+ # generate Latex output.
+ 
+-GENERATE_LATEX         = YES
++GENERATE_LATEX         = NO
+ 
+ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+diff -rupN portmidi.old/no_date_footer.html portmidi/no_date_footer.html
+--- portmidi.old/no_date_footer.html	1969-12-31 19:00:00.000000000 -0500
++++ portmidi/no_date_footer.html	2012-06-04 20:21:32.825802299 -0400
+@@ -0,0 +1,6 @@
++<hr size="1"><address style="text-align: right;"><small>
++Generated for $projectname by <a href="http://www.doxygen.org/
++index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
++$doxygenversion</small></address>
++</body>
++</html>
diff --git a/portmidi.spec b/portmidi.spec
index 36e1008..80f84d0 100644
--- a/portmidi.spec
+++ b/portmidi.spec
@@ -1,9 +1,7 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 Summary:        Real-time Midi I/O Library
 Name:           portmidi
 Version:        217
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://portmedia.sourceforge.net/
@@ -11,16 +9,16 @@ Source0:        http://downloads.sourceforge.net/portmedia/%{name}-src-%{version
 Source1:        pmdefaults.desktop
 # Build fixes:
 Patch0:         portmidi-cmake.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix multilib conflict RHBZ#831432
+Patch1:         portmidi-no_date_footer.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
-BuildRequires:  java-devel >= 1.5
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  jpackage-utils
 BuildRequires:  python2-devel
 BuildRequires:  doxygen
 BuildRequires:  tex(latex)
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
 
 %description
 PortMedia is a set of simple clean APIs and cross-platform library
@@ -31,7 +29,7 @@ libraries.
 %package devel
 Summary:        Headers for developing programs that will use %{name}
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 PortMedia is a set of simple clean APIs and cross-platform library
@@ -42,7 +40,7 @@ and the documentation of PortMidi libraries.
 %package -n python-%{name}
 Summary:        Python wrapper for %{name}
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n python-%{name}
 PortMedia is a set of simple clean APIs and cross-platform library
@@ -55,11 +53,9 @@ real-time from Python.
 Summary:          Tools to configure and use %{name}
 Group:            Applications/Multimedia
 Requires:         hicolor-icon-theme
-Requires:         java >= 1.5
+Requires:         java >= 1.7
 Requires:         jpackage-utils
-Requires:         %{name} = %{version}-%{release}
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Requires:         %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
 PortMedia is a set of simple clean APIs and cross-platform library
@@ -70,6 +66,7 @@ configuration utility "pmdefaults" and some test applications.
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .buildfix
+%patch1 -p1 -b .no.date
 
 # ewwww... binaries
 rm -f portmidi_cdt.zip */*.exe */*/*.exe
@@ -101,9 +98,6 @@ make %{?_smp_flags}
 
 # Build the doxygen documentation:
 doxygen
-pushd latex
-   make %{?_smp_flags}
-popd
 
 # Build python modules
 PYTHON_VER=$(python -c "from sys import version; print (version[:3])")
@@ -116,8 +110,7 @@ pushd pm_python/pyportmidi
 popd
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%make_install
 
 # Install the test applications:
 install -d %{buildroot}%{_libdir}/%{name}
@@ -161,63 +154,37 @@ popd
 # Remove duplicate library
 rm -f %{buildroot}%{_libdir}/libportmidi_s.so
 
-# AOT bits
-%if %{with_gcj}
-   %{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post tools
-%if %{with_gcj}
-   if [ -x %{_bindir}/rebuild-gcj-db ] 
-      then
-      %{_bindir}/rebuild-gcj-db
-   fi
-%endif
-
-%postun tools
-%if %{with_gcj}
-   if [ -x %{_bindir}/rebuild-gcj-db ] 
-      then
-      %{_bindir}/rebuild-gcj-db
-   fi
-%endif
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGELOG.txt license.txt
 %{_libdir}/lib*.so.*
 
 %files tools
-%defattr(-,root,root,-)
 %doc pm_java/pmdefaults/README.txt pm_cl/*
 %{_libdir}/%{name}/
 %{_bindir}/pmdefaults
 %{_datadir}/icons/hicolor/128x128/apps/pmdefaults-icon.png
 %{_desktopdir}/pmdefaults.desktop
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}/
-%endif
 
 %files -n python-%{name}
-%defattr(-,root,root,-)
 %doc pm_python/README_PYTHON.txt
 %{python_sitearch}/pyportmidi/
 
 %files devel
-%defattr(-,root,root,-)
 %doc README.txt
-%doc html latex/*.pdf
+%doc html
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Jun 12 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 217-6
+- Fix multilib conflict RHBZ#831432
+- Don't bulid PDF doc, as it causes another multilib conflict
+- Specfile cleanup. Drop old GCJ-Java and Python bits
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 217-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
