X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=plymouth%2Fplymouth.nm;h=26669281065a191a123747704e7c376351857732;hb=988db099886b1800c5d2da96bba37b366ed4156d;hp=c46ceb71c4fb5b9ca0f45bdb6ec0301833837a97;hpb=a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364;p=people%2Fstevee%2Fipfire-3.x.git

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index c46ceb71c..266692810 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.4
-release    = 2
+version    = 0.9.2
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -27,30 +27,19 @@ build
 		autoconf
 		automake
 		cairo-devel
+		docbook-xsl
 		glib2-devel
 		pkgconfig(libdrm)
-		pkgconfig(libdrm_radeon)
-		pkgconfig(libdrm_nouveau)
 		libpng-devel
+		libudev-devel
 		pango-devel
+		systemd-devel
 	end
 
-	enable_libdrm_intel = 0
-
-	if "%{DISTRO_MACHINE}" == "x86_64"
-		enable_libdrm_intel = 1
-		requires += pkgconfig(libdrm_intel)
-	end
-
-	if "%{DISTRO_MACHINE}" == "i686"
-		enable_libdrm_intel = 1
-		requires += pkgconfig(libdrm_intel)
-	end
-
-	CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-
 	configure_options += \
 		--libexecdir=/usr/lib \
+		--disable-libkms \
+		--disable-gtk \
 		--enable-tracing \
 		--disable-tests \
 		--with-logo=%{datadir}/pixmaps/system-logo-white.png \
@@ -63,14 +52,14 @@ build
 		--without-rhgb-compat-link \
 		--without-log-viewer
 
-	if "%{enable_libdrm_intel}" == "0"
-		configure_options += --disable-libdrm_intel
-	end
-
 	prepare_cmds
 		autoreconf -vfi
 	end
 
+	# Fix install location for systemd files.
+	make_install_targets += \
+		SYSTEMD_UNIT_DIR=%{unitdir}
+
 	install_cmds
 		mkdir -pv %{BUILDROOT}%{datadir}/plymouth
 		mkdir -pv %{BUILDROOT}%{localstatedir}/lib/plymouth
@@ -79,10 +68,10 @@ build
 		cp -vf %{DIR_SOURCE}/boot-duration \
 			%{BUILDROOT}%{localstatedir}/lib/plymouth
 
-		# Override plymouth-update-initrd to work dracut or mkinitrd
-		cp -vf %{DIR_SOURCE}/plymouth-update-initrd \
-			%{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
-		chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
+		# The "glow" theme isn't quite ready for primetime, so drop it.
+		rm -rvf %{BUILDROOT}%{datadir}/plymouth/themes/glow
+		rm -rvf %{BUILDROOT}%{datadir}/plymouth/glow/
+		rm -rvf %{BUILDROOT}%{libdir}/plymouth/glow.so
 	end
 end
 
@@ -101,6 +90,10 @@ packages
 			initscripts
 		end
 
+		conflicts
+			systemd-units < 185-3
+		end
+
 		configfiles
 			/etc/plymouth/plymouthd.conf
 		end
@@ -110,15 +103,26 @@ packages
 				cp -f %{datadir}/plymouth/default-boot-duration \
 					%{localstatedir}/lib/plymouth/boot-duration
 			fi
+
+			# Just search for new unit files that were just installed.
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
-		script posttransin
-			/usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
+		# Reload systemd after update.
+		script postup
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
+		# Tell systemd that unitfiles have been removed.
 		script postun
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
 			rm -f /boot/initrd-plymouth.img
 		end
+
+		script posttransin
+			/usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
+		end
 	end
 
 	package %{name}-libs
@@ -261,7 +265,7 @@ packages
 		end
 
 		script postun
-			if [ "$(%{sbindir}/plymouth-set-default-theme)" = %{theme_name}" ]; then
+			if [ "$(%{sbindir}/plymouth-set-default-theme)" = "%{theme_name}" ]; then
 				%{sbindir}/plymouth-set-default-theme --reset
 				/usr/lib/plymouth/plymouth-generate-initrd
 			fi