rpms/nspluginwrapper/devel nspluginwrapper.spec,1.73,1.74

[Martin Stransky]

Author: stransky

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

Modified Files:
	nspluginwrapper.spec 
Log Message:
* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
- Fixed multilib conflicts




Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nspluginwrapper.spec	9 Jan 2009 10:28:45 -0000	1.73
+++ nspluginwrapper.spec	9 Jan 2009 10:43:18 -0000	1.74
@@ -65,7 +65,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -199,6 +199,10 @@
 EOF
 chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
 
+# Remove conflicting files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -230,10 +234,11 @@
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
 
-%exclude %{_bindir}/nspluginplayer
-%exclude %{_bindir}/nspluginwrapper
 
 %changelog
+* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
+- Fixed multilib conflicts
+
 * Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
 - Updated to 1.3.0 and removed some fedora build patches