diff --git a/oxygen-icons.spec b/oxygen-icons.spec index d16d7dc..6d12293 100644 --- a/oxygen-icons.spec +++ b/oxygen-icons.spec @@ -1,6 +1,6 @@ Name: oxygen-icons Version: 15.04.3 -Release: 1mamba +Release: 2mamba Summary: Oxygen icons for the KDE Software Compilation 4 Group: Graphical Desktop/Look 'n' feel Vendor: openmamba @@ -31,51 +31,51 @@ Vectorial (SVG) Oxygen icons for KDE Software Compilation 4. %setup -q %build -%cmake_kde4 -d build +%cmake -d build %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -cp -r scalable %{buildroot}%{_kde4_icondir}/oxygen/ +cp -r scalable %{buildroot}%{_datadir}/icons/oxygen/ # install openmamba icons for s in 16x16 22x22 32x32 48x48 64x64 128x128 256x256; do convert -background none -resize $s %{SOURCE1} \ - %{buildroot}%{_kde4_icondir}/oxygen/$s/apps/openmamba.png - rm %{buildroot}%{_kde4_icondir}/oxygen/$s/places/start-here-kde.png - rm %{buildroot}%{_kde4_icondir}/oxygen/$s/places/start-here.png - ln -s ../apps/openmamba.png %{buildroot}%{_kde4_icondir}/oxygen/$s/places/start-here-kde.png - ln -s ../apps/openmamba.png %{buildroot}%{_kde4_icondir}/oxygen/$s/places/start-here.png + %{buildroot}%{_datadir}/icons/oxygen/$s/apps/openmamba.png + rm %{buildroot}%{_datadir}/icons/oxygen/$s/places/start-here-kde.png + rm %{buildroot}%{_datadir}/icons/oxygen/$s/places/start-here.png + ln -s ../apps/openmamba.png %{buildroot}%{_datadir}/icons/oxygen/$s/places/start-here-kde.png + ln -s ../apps/openmamba.png %{buildroot}%{_datadir}/icons/oxygen/$s/places/start-here.png done -install -m0644 %{S:1} %{buildroot}%{_kde4_icondir}/oxygen/scalable/places/start-here-kde.svgz -install -m0644 %{S:1} %{buildroot}%{_kde4_icondir}/oxygen/scalable/apps/openmamba.svgz +install -m0644 %{S:1} %{buildroot}%{_datadir}/icons/oxygen/scalable/places/start-here-kde.svgz +install -m0644 %{S:1} %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/openmamba.svgz %post -touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || : +touch --no-create %{_datadir}/icons/oxygen &>/dev/null || : %posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || : +gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null || : %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null - gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null + touch --no-create %{_datadir}/icons/oxygen &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null fi exit 0 %post svg -touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || : +touch --no-create %{_datadir}/icons/oxygen &>/dev/null || : %posttrans svg -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || : +gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null || : %postun svg if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null - gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null + touch --no-create %{_datadir}/icons/oxygen &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null fi exit 0 @@ -84,31 +84,34 @@ exit 0 %files svg %defattr(-,root,root) -%{_kde4_icondir}/oxygen/scalable +%{_datadir}/icons/oxygen/scalable %doc AUTHORS COPYING %files %defattr(-,root,root) -%{_kde4_icondir}/oxygen/index.theme -%dir %{_kde4_icondir}/oxygen -%dir %{_kde4_icondir}/oxygen/8x8 -%{_kde4_icondir}/oxygen/8x8/* -%dir %{_kde4_icondir}/oxygen/16x16 -%{_kde4_icondir}/oxygen/16x16/* -%dir %{_kde4_icondir}/oxygen/22x22 -%{_kde4_icondir}/oxygen/22x22/* -%dir %{_kde4_icondir}/oxygen/32x32 -%{_kde4_icondir}/oxygen/32x32/* -%dir %{_kde4_icondir}/oxygen/48x48 -%{_kde4_icondir}/oxygen/48x48/* -%dir %{_kde4_icondir}/oxygen/64x64 -%{_kde4_icondir}/oxygen/64x64/* -%dir %{_kde4_icondir}/oxygen/128x128 -%{_kde4_icondir}/oxygen/128x128/* -%dir %{_kde4_icondir}/oxygen/256x256 -%{_kde4_icondir}/oxygen/256x256/* +%{_datadir}/icons/oxygen/index.theme +%dir %{_datadir}/icons/oxygen +%dir %{_datadir}/icons/oxygen/8x8 +%{_datadir}/icons/oxygen/8x8/* +%dir %{_datadir}/icons/oxygen/16x16 +%{_datadir}/icons/oxygen/16x16/* +%dir %{_datadir}/icons/oxygen/22x22 +%{_datadir}/icons/oxygen/22x22/* +%dir %{_datadir}/icons/oxygen/32x32 +%{_datadir}/icons/oxygen/32x32/* +%dir %{_datadir}/icons/oxygen/48x48 +%{_datadir}/icons/oxygen/48x48/* +%dir %{_datadir}/icons/oxygen/64x64 +%{_datadir}/icons/oxygen/64x64/* +%dir %{_datadir}/icons/oxygen/128x128 +%{_datadir}/icons/oxygen/128x128/* +%dir %{_datadir}/icons/oxygen/256x256 +%{_datadir}/icons/oxygen/256x256/* %changelog +* Wed Aug 26 2015 Silvan Calarco 15.04.3-2mamba +- rebuilt in /usr + * Thu Jul 02 2015 Automatic Build System 15.04.3-1mamba - automatic version update by autodist