diff --git a/baselibs.conf b/baselibs.conf index 927a523..ea7cd05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -28,4 +28,3 @@ wine requires "libGL.so.1" requires "libGLU.so.1" wine-devel -libwine1 diff --git a/wine-rpmlintrc b/wine-rpmlintrc index 4424dc2..c18c8eb 100644 --- a/wine-rpmlintrc +++ b/wine-rpmlintrc @@ -1,2 +1,4 @@ # Some of our .a files are data only, rpmlint check does not cover that addFilter("lto-no-text-in-archive") +# we have a libwine.so.1, but it is really just for wine usage only. +addFilter("shlib-policy-name-error") diff --git a/wine.spec b/wine.spec index 04c7a96..ef7440f 100644 --- a/wine.spec +++ b/wine.spec @@ -214,26 +214,6 @@ Conflicts: otherproviders(wine-devel) This RPM contains the header files and development tools for the WINE libraries. -%if "%{flavor}" != "" -%package -n libwine1-%{flavor} -%else -%package -n libwine1 -%endif -Summary: The Wine shared library -Group: System/Emulators/PC -%if "%{flavor}" != "" -Provides: libwine1 = %{version} -%endif -Conflicts: otherproviders(libwine1) - -%if "%{flavor}" != "" -%description -n libwine1-%{flavor} -%else -%description -n libwine1 -%endif -This RPM contains the header files and development tools for the WINE -libraries. - %prep %setup -q -n wine-%{realver} #patch0 -p1 @@ -329,13 +309,6 @@ echo " provides \"wine-devel- = \"" >> %SOURCE7 %endif echo " conflicts \"otherproviders(wine-devel-)\"" >> %SOURCE7 -%if "%{flavor}" != "" -echo "libwine1-%{flavor}" >> %SOURCE7 -echo " provides \"libwine1- = \"" >> %SOURCE7 -%else -echo "libwine1" >> %SOURCE7 -%endif -echo " conflicts \"otherproviders(libwine1-)\"" >> %SOURCE7 cat %SOURCE7 %endif make %{?_smp_mflags} all @@ -502,14 +475,6 @@ chmod 755 %winedir/my-find-requires.sh %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls %{_libdir}/wine/fakedlls/* - -%if "%{flavor}" != "" -%files -n libwine1-%{flavor} -%else -%files -n libwine1 -%endif -%defattr(-,root,root) -%license LICENSE LICENSE.OLD %{_libdir}/lib*.so.* %files devel