OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/oxygen5?expand=0&rev=8

oxygen5.spec

@@ -18,7 +18,7 @@
 %define kwin_deco 1
 
 Name:           oxygen5
-Version:        4.96.0
+Version:        4.97.0
 Release:        0
 Summary:        Oxygen style, KWin decoration, cursors and sounds
 License:        LGPL-2.0+
@@ -43,14 +43,14 @@ BuildRequires:  libkdecorations-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
-BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.2.0
-Requires:       oxygen-style5
-Requires:       oxygen-decoration5
-Recommends:     oxygen-sounds5
+BuildRequires:  pkgconfig(Qt5Core) >= 5.3.0
+BuildRequires:  pkgconfig(Qt5DBus) >= 5.3.0
+BuildRequires:  pkgconfig(Qt5Test) >= 5.3.0
+BuildRequires:  pkgconfig(Qt5Widgets) >= 5.3.0
+BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.3.0
+Requires:       oxygen5-style
+Requires:       oxygen5-decoration
+Recommends:     oxygen5-sounds
 Recommends:     oxygen-cursors
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -66,45 +66,53 @@ Requires:       %{name} = %{version}
 Provides Oxygen style, KWin decoration, cursors and sounds.
 Development files.
 
-%package -n oxygen-sounds5
+%package sounds
 Summary:        The KDE Workspace Sounds
 Group:          System/GUI/KDE
+Obsoletes:      oxygen-sounds5
+Provides:       oxygen-sounds5
 
-%description -n oxygen-sounds5
+%description sounds
 This package contains the default sound set for a K Desktop Environment
 workspace.
 
-%package -n oxygen-cursors5
+%package cursors
 Summary:        The KDE Workspace Cursors
 Group:          System/GUI/KDE
 Provides:       oxygen-cursors = %{version}
 Conflicts:      oxygen-cursors4
+Obsoletes:      oxygen-cursors5
+Provides:       oxygen-cursors5
 
-%description -n oxygen-cursors5
+%description cursors
 This package contains the default cursor set for a K Desktop Environment
 workspace.
 
-%package -n oxygen-style5
+%package style
 Summary:        Oxygen style
 Group:          System/GUI/KDE
+Obsoletes:      oxygen-style5
+Provides:       oxygen-style5
 
-%description -n oxygen-style5
+%description style
 This package contains the libraries of the Oxygen style.
 
 %if %kwin_deco
-%package -n oxygen-decoration5
+%package decoration
 Summary:        Oxygen's KWin decoration
 Group:          System/GUI/KDE
-%requires_eq oxygen-style5
+Obsoletes:      oxygen-decoration5
+Provides:       oxygen-decoration5
+%requires_eq oxygen5-style
 
-%description -n oxygen-decoration5
+%description decoration
 This package contains the libraries Oxygen's KWin decoration.
 %endif
 
 %prep
 %setup -q -n oxygen-%{version}
 %patch1 -p1
-sed -i '/^ecm_optional_add_subdirectory( po )/d' CMakeLists.txt
+sed -i '/^ecm_optional_add_subdirectory(po)/d' CMakeLists.txt
 
 %build
 %cmake_kf5 -d build
@@ -113,21 +121,21 @@ sed -i '/^ecm_optional_add_subdirectory( po )/d' CMakeLists.txt
 %install
   %kf5_makeinstall -C build
 
-%post     -n oxygen-style5 -p /sbin/ldconfig
+%post     style -p /sbin/ldconfig
 
-%postun   -n oxygen-style5 -p /sbin/ldconfig
+%postun   style -p /sbin/ldconfig
 
 %if %kwin_deco
-%post     -n oxygen-decoration5   -p /sbin/ldconfig
+%post     decoration   -p /sbin/ldconfig
 
-%postun   -n oxygen-decoration5   -p /sbin/ldconfig
+%postun   decoration   -p /sbin/ldconfig
 %endif
 
 %files
 %defattr(-,root,root)
 %doc COPYING*
 
-%files -n oxygen-style5
+%files style
 %defattr(-,root,root)
 %doc COPYING*
 %{_kf5_bindir}/oxygen-demo5
@@ -139,19 +147,18 @@ sed -i '/^ecm_optional_add_subdirectory( po )/d' CMakeLists.txt
 %{_kf5_sharedir}/kstyle/
 
 %if %kwin_deco
-%files -n oxygen-decoration5
+%files decoration
 %defattr(-,root,root)
 %doc COPYING*
-%{_kf5_bindir}/oxygen-shadow-demo5
 %{_kf5_plugindir}/kwin/
 %endif
 
-%files -n oxygen-sounds5
+%files sounds
 %defattr(-,root,root)
 %doc COPYING*
 %{_kf5_sharedir}/sounds/
 
-%files -n oxygen-cursors5
+%files cursors
 %defattr(-,root,root)
 %doc COPYING*
 %{_kf5_sharedir}/icons/Oxygen_*/