rpms/mm/devel mm.spec,1.5,1.6

[Andreas Thienemann]

Author: ixs

Update of /cvs/pkgs/rpms/mm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5841

Modified Files:
	mm.spec 
Log Message:
* Thu Oct 23 2008 Andreas Thienemann <andreas at bawue.net> - 1.4.2-5
- Updated pkgconfig to remove multilib conflict.



Index: mm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mm/devel/mm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mm.spec	19 Feb 2008 05:18:56 -0000	1.5
+++ mm.spec	23 Oct 2008 18:55:05 -0000	1.6
@@ -17,41 +17,55 @@
 malloc(3)-style API for a convenient and well known way to work with
 data structures inside those shared memory segments.
 
+
 %package devel
 Summary: Header files and libraries for %{name} development
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
+
 %description devel
 The %{name}-devel package contains the header files and libraries needed
 to develop programs that use the %{name} library.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure --enable-debug
 %{__make} %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 find %{buildroot} -name "*.la" -exec rm -f {} \;
 find %{buildroot} -name "*.a" -exec rm -f {} \;
+
 # Fix permissions, so that find-debuginfo.sh picks up the libraries
 find %{buildroot} -name *.so.* -type f -exec chmod 755 {} \;
 
+# Fix the installed mm-config script to remove unnecessary flags and
+# prevent a multilib conflict
+sed -i -e 's#^mm_libdir=.*#mm_libdir=#; s# -L$mm_libdir##; s# -m[36][24]##' %{buildroot}%{_bindir}/mm-config
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE THANKS README
 %{_libdir}/*.so.*
 
+
 %files devel
 %doc ChangeLog
 %defattr(-, root, root)
@@ -61,7 +75,11 @@
 %{_mandir}/man1/mm-config.1*
 %{_mandir}/man3/mm.3*
 
+
 %changelog
+* Thu Oct 23 2008 Andreas Thienemann <andreas at bawue.net> - 1.4.2-5
+- Updated pkgconfig to remove multilib conflict.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.2-4
 - Autorebuild for GCC 4.3