Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 911816 Details for
Bug 1030768
hamlib.x86_64 conflicts with hamlib.i686
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Proposed fix
sitearch-fix.patch (text/plain), 6.24 KB, created by
Jaroslav Škarvada
on 2014-06-24 17:24:41 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Jaroslav Škarvada
Created:
2014-06-24 17:24:41 UTC
Size:
6.24 KB
patch
obsolete
>diff --git a/hamlib-1.2.15.3-sitearch-fix.patch b/hamlib-1.2.15.3-sitearch-fix.patch >new file mode 100644 >index 0000000..9db985d >--- /dev/null >+++ b/hamlib-1.2.15.3-sitearch-fix.patch >@@ -0,0 +1,97 @@ >+diff --git a/bindings/Makefile.am b/bindings/Makefile.am >+index 29d2613..282c7a4 100644 >+--- a/bindings/Makefile.am >++++ b/bindings/Makefile.am >+@@ -114,7 +114,7 @@ nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c >+ _Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version >+ _Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la >+ >+-_Hamlib_ladir = $(pythondir) >++_Hamlib_ladir = $(pyexecdir) >+ >+ all-py: $(python_ltlib) >+ >+diff --git a/bindings/Makefile.in b/bindings/Makefile.in >+index 88798b5..fb2c203 100644 >+--- a/bindings/Makefile.in >++++ b/bindings/Makefile.in >+@@ -91,7 +91,7 @@ am__base_list = \ >+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ >+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' >+ am__installdirs = "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" \ >+- "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(hamlibtcl_ladir)" >++ "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(hamlibtcl_ladir)" >+ LTLIBRARIES = $(_Hamlib_la_LTLIBRARIES) $(lib_LTLIBRARIES) >+ @ENABLE_PYTHON_TRUE@_Hamlib_la_DEPENDENCIES = \ >+ @ENABLE_PYTHON_TRUE@ $(top_builddir)/src/libhamlib.la >+@@ -364,7 +364,7 @@ AM_CFLAGS = -fno-strict-aliasing >+ @ENABLE_PYTHON_TRUE@nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c >+ @ENABLE_PYTHON_TRUE@_Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version >+ @ENABLE_PYTHON_TRUE@_Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la >+-@ENABLE_PYTHON_TRUE@_Hamlib_ladir = $(pythondir) >++@ENABLE_PYTHON_TRUE@_Hamlib_ladir = $(pyexecdir) >+ @ENABLE_PYTHON_TRUE@python_PYTHON = Hamlib.py >+ @ENABLE_PYTHON_TRUE@_Hamlib_la_LTLIBRARIES = $(python_ltlib) >+ >+@@ -519,8 +519,8 @@ clean-libtool: >+ -rm -rf .libs _libs >+ install-pythonPYTHON: $(python_PYTHON) >+ @$(NORMAL_INSTALL) >+- test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)" >+- @list='$(python_PYTHON)'; dlist=; list2=; test -n "$(pythondir)" || list=; \ >++ test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" >++ @list='$(python_PYTHON)'; dlist=; list2=; test -n "$(pyexecdir)" || list=; \ >+ for p in $$list; do \ >+ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ >+ if test -f $$b$$p; then \ >+@@ -531,30 +531,30 @@ install-pythonPYTHON: $(python_PYTHON) >+ done; \ >+ for file in $$list2; do echo $$file; done | $(am__base_list) | \ >+ while read files; do \ >+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythondir)'"; \ >+- $(INSTALL_DATA) $$files "$(DESTDIR)$(pythondir)" || exit $$?; \ >++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pyexecdir)'"; \ >++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pyexecdir)" || exit $$?; \ >+ done || exit $$?; \ >+ if test -n "$$dlist"; then \ >+ if test -z "$(DESTDIR)"; then \ >+- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \ >++ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \ >+ else \ >+- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \ >++ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \ >+ fi; \ >+ else :; fi >+ >+ uninstall-pythonPYTHON: >+ @$(NORMAL_UNINSTALL) >+- @list='$(python_PYTHON)'; test -n "$(pythondir)" || list=; \ >++ @list='$(python_PYTHON)'; test -n "$(pyexecdir)" || list=; \ >+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+ test -n "$$files" || exit 0; \ >+ filesc=`echo "$$files" | sed 's|$$|c|'`; \ >+ fileso=`echo "$$files" | sed 's|$$|o|'`; \ >+- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$files ")"; \ >+- cd "$(DESTDIR)$(pythondir)" && rm -f $$files || exit $$?; \ >+- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$filesc ")"; \ >+- cd "$(DESTDIR)$(pythondir)" && rm -f $$filesc || exit $$?; \ >+- echo " ( cd '$(DESTDIR)$(pythondir)' && rm -f" $$fileso ")"; \ >+- cd "$(DESTDIR)$(pythondir)" && rm -f $$fileso >++ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$files ")"; \ >++ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$files || exit $$?; \ >++ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$filesc ")"; \ >++ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$filesc || exit $$?; \ >++ echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$fileso ")"; \ >++ cd "$(DESTDIR)$(pyexecdir)" && rm -f $$fileso >+ install-hamlibtcl_laDATA: $(hamlibtcl_la_DATA) >+ @$(NORMAL_INSTALL) >+ test -z "$(hamlibtcl_ladir)" || $(MKDIR_P) "$(DESTDIR)$(hamlibtcl_ladir)" >+@@ -664,7 +664,7 @@ check: $(BUILT_SOURCES) >+ $(MAKE) $(AM_MAKEFLAGS) check-am >+ all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) all-local >+ installdirs: >+- for dir in "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(hamlibtcl_ladir)"; do \ >++ for dir in "$(DESTDIR)$(_Hamlib_ladir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(hamlibtcl_ladir)"; do \ >+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ >+ done >+ install: $(BUILT_SOURCES) >diff --git a/hamlib.spec b/hamlib.spec >index a4c2537..3579db2 100644 >--- a/hamlib.spec >+++ b/hamlib.spec >@@ -1,4 +1,3 @@ >-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} > %global __provides_exclude_from ^%{_libdir}/hamlib/.*\\.so$ > > Name: hamlib >@@ -10,9 +9,10 @@ Group: System Environment/Libraries > License: GPLv2+ and LGPLv2+ > URL: http://hamlib.sourceforge.net > Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz >-#Install python and perl bindings into proper dirs >+# Install python and perl bindings into proper dirs > Patch0: hamlib-1.2.13-bindings.patch >- >+# Install python bindings to sitearch >+Patch1: hamlib-1.2.15.3-sitearch-fix.patch > BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel > BuildRequires: libusb-devel, pkgconfig, boost-devel, libtool-ltdl-devel > BuildRequires: doxygen >@@ -92,6 +92,7 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. > %prep > %setup -q > %patch0 -p1 -b .bindings >+%patch1 -p1 -b .sitearch-fix > > %build > %configure \ >@@ -191,8 +192,8 @@ find $RPM_BUILD_ROOT -type f -name perltest.pl -exec rm -f {} ';' > %{perl_vendorarch}/* > > %files python >-%{python_sitelib}/*.py* >-%{python_sitelib}/_Hamlib.so >+%{python_sitearch}/*.py* >+%{python_sitearch}/_Hamlib.so > > %files tcl > %{_libdir}/hamlibtcl*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1030768
: 911816