commit splashy for openSUSE:Factory
Hello community, here is the log from the commit of package splashy for openSUSE:Factory checked in at 2013-01-03 14:22:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/splashy (Old) and /work/SRC/openSUSE:Factory/.splashy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "splashy", Maintainer is "hmacht@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/splashy/splashy.changes 2012-08-04 13:30:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.splashy.new/splashy.changes 2013-01-03 14:22:33.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 27 21:38:19 UTC 2012 - giecrilj@stegny.2a.pl + +- move README.themes to %{_datadir} +- macroize the spec file +- minor syntactic tweaks + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ --- /var/tmp/diff_new_pack.xrqGAC/_old 2013-01-03 14:22:38.000000000 +0100 +++ /var/tmp/diff_new_pack.xrqGAC/_new 2013-01-03 14:22:38.000000000 +0100 @@ -107,21 +107,21 @@ * Totally configurable -%package -n splashy-devel +%package devel Summary: Development tools for programs using libsplashy Group: Development/Languages/C and C++ -Requires: splashy = %{version} +Requires: %{name} = %{version} -%description -n splashy-devel +%description devel This package contains the header files and libraries needed for developing programs using libsplashy. -%package -n splashy-themes +%package themes Summary: Additional themes for splashy Group: System/Boot Requires: %{name} = %{version}-%{release} -%description -n splashy-themes +%description themes Available themes: - fingerprint - aqua @@ -136,42 +136,42 @@ Summary: Splashy branding for openSUSE Group: System/Boot Supplements: packageand(splashy:branding-openSUSE) -Provides: splashy-branding = %{version} -Conflicts: otherproviders(splashy-branding) -Requires(pre): splashy >= 0.3.8 +Provides: %{name}-branding = %{version} +Conflicts: otherproviders(%{name}-branding) +Requires(pre): %{name} >= 0.3.8 %description branding-openSUSE -Splashy branding for openSUSE +Splashy branding for openSUSE Linux distribution %package branding-SLED Summary: Splashy branding for SLED Group: System/Boot Supplements: packageand(splashy:branding-SLED) -Provides: splashy-branding = %{version} -Conflicts: otherproviders(splashy-branding) -Requires(pre): splashy >= 0.3.8 +Provides: %{name}-branding = %{version} +Conflicts: otherproviders(%{name}-branding) +Requires(pre): %{name} >= 0.3.8 %description branding-SLED -Splashy branding for SLED +Splashy branding for SUSE Linux Enterprise Desktop %post branding-openSUSE -if [ -x %{_sbindir}/splashy_config ] ; then -%{_sbindir}/splashy_config --set-theme openSUSE +if [ -x '%{_sbindir}/%{name}_config' ] ; then +'%{_sbindir}/%{name}_config' --set-theme openSUSE fi %postun branding-openSUSE -if [ -x %{_sbindir}/splashy_config ] ; then -%{_sbindir}/splashy_config --set-theme default +if [ -x '%{_sbindir}/%{name}_config' ] ; then +%{_sbindir}/%{name}_config --set-theme default fi %post branding-SLED -if [ -x %{_sbindir}/splashy_config ] ; then -%{_sbindir}/splashy_config --set-theme SLED +if [ -x '%{_sbindir}/%{name}_config' ] ; then +'%{_sbindir}/%{name}_config' --set-theme SLED fi %postun branding-SLED -if [ -x %{_sbindir}/splashy_config ] ; then -%{_sbindir}/splashy_config --set-theme default +if [ -x '%{_sbindir}/%{name}_config' ] ; then +'%{_sbindir}/%{name}_config' --set-theme default fi %package mkinitrd @@ -225,24 +225,27 @@ %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" %makeinstall -cp -r themes $RPM_BUILD_ROOT/usr/share/splashy/ -rm %{buildroot}/usr/lib*/libsplashy*.la +cp '-t%{buildroot}%{_datadir}/%{name}' -r themes +rm '%{buildroot}'/usr/lib*/lib%{name}*.la # remove Debian-specific files -cd %{buildroot} -rm -f .%{_sysconfdir}/lsb-base-logging.sh -rm -rf .%{_sysconfdir}/console-tools -rm -rf .%{_datadir}/initramfs-tools #remove splashy init script for now, it's not working anyway #TODO, fixup init-script, install with chmod +x, link to /usr/sbin/rcsplash -rm -f .%{_sysconfdir}/init.d/splashy -mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/ -tar xvf %{SOURCE3} -C $RPM_BUILD_ROOT/usr/share/splashy/ -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/splashy/ -#mkdir -p $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/ -#cp %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/99splashy -# remove translations for now TODO: #%find_lang %name -rm %{buildroot}/%{_datadir}/locale/*/LC_MESSAGES/splashy.mo +rm -rf \ + '%{buildroot}%{_sysconfdir}/lsb-base-logging.sh' \ + '%{buildroot}%{_sysconfdir}/console-tools' \ + '%{buildroot}%{_datadir}/initramfs-tools' \ + '%{buildroot}%{_sysconfdir}/init.d/%{name}' +mkdir -p '%{buildroot}/lib/mkinitrd/scripts' +install -m 755 '%{SOURCE1}' '%{buildroot}/lib/mkinitrd/scripts/' +tar xvf '%{SOURCE3}' -C '%{buildroot}%{_datadir}/%{name}/' +install -m 644 '-t%{buildroot}%{_datadir}/%{name}/themes' '%{SOURCE4}' +ln -s '-t%{buildroot}%{_sysconfdir}/%{name}/' '%{_datadir}/%{name}/themes/README.themes' +%if 0 +mkdir -p $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/ +cp %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/99splashy +%{nil remove translations for now TODO: %find_lang %name} +%endif +rm '%{buildroot}/%{_datadir}/locale/'*'/LC_MESSAGES/%{name}.mo' %clean rm -rf %{buildroot} @@ -255,46 +258,47 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/default/* -%dir %{_sysconfdir}/splashy -%config(noreplace) %{_sysconfdir}/splashy/config.xml +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/config.xml %{_sbindir}/* %{_mandir}/man1/* %{_mandir}/man5/* -%dir %{_datadir}/splashy +%dir %{_datadir}/%{name} %{_libdir}/lib%{name}*.so.* %{_datadir}/splashy/schemas # this is a symbolic link to /usr/share/splashy/themes -%{_sysconfdir}/splashy/README.themes -%{_sysconfdir}/splashy/themes -%dir %{_datadir}/splashy/themes -/usr/share/splashy/themes/default +%{_sysconfdir}/%{name}/README.themes +%{_sysconfdir}/%{name}/themes +%dir %{_datadir}/%{name}/themes +%{_datadir}/%{name}/themes/default +%doc %{_datadir}/%{name}/themes/README.themes -%files -n splashy-devel +%files devel %defattr(-,root,root) %{_includedir}/%{name}*.h %{_libdir}/lib%{name}*.so -%{_libdir}/pkgconfig/splashy.pc +%{_libdir}/pkgconfig/%{name}.pc -%files -n splashy-themes +%files themes %defattr(-,root,root) -%dir %{_datadir}/splashy/themes -/usr/share/splashy/themes/fingerprint -/usr/share/splashy/themes/mepis_baghira -/usr/share/splashy/themes/aqua -/usr/share/splashy/themes/openSUSE-zz +%dir %{_datadir}/%{name}/themes +%{_datadir}/%{name}/themes/fingerprint +%{_datadir}/%{name}/themes/mepis_baghira +%{_datadir}/%{name}/themes/aqua +%{_datadir}/%{name}/themes/openSUSE-zz %files branding-openSUSE %defattr(-,root,root) -%dir %{_datadir}/splashy/themes -/usr/share/splashy/themes/openSUSE +%dir %{_datadir}/%{name}/themes +%{_datadir}/%{name}/themes/openSUSE %files branding-SLED %defattr(-,root,root) -%dir %{_datadir}/splashy/themes -/usr/share/splashy/themes/SLED +%dir %{_datadir}/%{name}/themes +%{_datadir}/%{name}/themes/SLED %files mkinitrd %defattr(-,root,root) -/lib/mkinitrd/scripts/setup-splashy.sh +/lib/mkinitrd/scripts/setup-%{name}.sh %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de