Rename fedora-fade-in to fade-in

The plugin doesn't need to be distro specific

diff --git a/configure.ac b/configure.ac
index 6fc3da236b25134d28d8c0922238fc0ed4b882e5..b86f35a40506b6ffe8099d2ab3f7c0671624f053 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_OUTPUT([Makefile
            src/libply/Makefile
            src/splash-plugins/Makefile
            src/splash-plugins/spinfinity/Makefile
-           src/splash-plugins/fedora-fade-in/Makefile
+           src/splash-plugins/fade-in/Makefile
            src/splash-plugins/text/Makefile
            src/splash-plugins/details/Makefile
            src/Makefile

diff --git a/scripts/plymouth.spec b/scripts/plymouth.spec
index 5b379175bbfaa0c98dc3c7482d1e4c76eb7573b0..494078ee44e07524806d6e64f954040ab2af8a2b 100644 (file)
--- a/scripts/plymouth.spec
+++ b/scripts/plymouth.spec
@@ -71,12 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plugin-fade-in
 %defattr(-, root, root)
-%dir %{_datadir}/plymouth/fedora-fade-in
-%{_datadir}/plymouth/fedora-fade-in/bullet.png
-%{_datadir}/plymouth/fedora-fade-in/entry.png
-%{_datadir}/plymouth/fedora-fade-in/lock.png
-%{_datadir}/plymouth/fedora-fade-in/star.png
-%{_libdir}/plymouth/fedora-fade-in.so
+%dir %{_datadir}/plymouth/fade-in
+%{_datadir}/plymouth/fade-in/bullet.png
+%{_datadir}/plymouth/fade-in/entry.png
+%{_datadir}/plymouth/fade-in/lock.png
+%{_datadir}/plymouth/fade-in/star.png
+%{_libdir}/plymouth/fade-in.so
 
 %files plugin-spinfinity
 %defattr(-, root, root)

diff --git a/src/splash-plugins/Makefile.am b/src/splash-plugins/Makefile.am
index e9b876a47700a7813616779a3bf131c067cb47d6..89cead96b85a3ce9e23bfb00817c563adb752b96 100644 (file)
--- a/src/splash-plugins/Makefile.am
+++ b/src/splash-plugins/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = spinfinity fedora-fade-in text details tests
+SUBDIRS = spinfinity fade-in text details tests
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/splash-plugins/fade-in/Makefile.am b/src/splash-plugins/fade-in/Makefile.am
new file mode 100644 (file)
index 0000000..a52e348
--- /dev/null
+++ b/src/splash-plugins/fade-in/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = -I$(top_srcdir)                                                    \
+           -I$(srcdir)/../../libply                                           \
+           -I$(srcdir)/../..                                                  \
+           -I$(srcdir)/..                                                     \
+           -I$(srcdir)
+
+plugindir = $(libdir)/plymouth
+plugin_LTLIBRARIES = fade-in.la
+
+fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"
+fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
+fade_in_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la
+fade_in_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h                 \
+                     $(srcdir)/../../ply-window.h                             \
+                     $(srcdir)/../../ply-window.c                             \
+                     $(srcdir)/plugin.c
+
+plymouthdir = $(datadir)/plymouth/fade-in
+plymouth_DATA = star.png bullet.png entry.png lock.png
+
+EXTRA_DIST = $(plymouth_DATA)
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/splash-plugins/fedora-fade-in/bullet.png b/src/splash-plugins/fade-in/bullet.png
similarity index 100%
rename from src/splash-plugins/fedora-fade-in/bullet.png
rename to src/splash-plugins/fade-in/bullet.png

diff --git a/src/splash-plugins/fedora-fade-in/entry.png b/src/splash-plugins/fade-in/entry.png
similarity index 100%
rename from src/splash-plugins/fedora-fade-in/entry.png
rename to src/splash-plugins/fade-in/entry.png

diff --git a/src/splash-plugins/fedora-fade-in/lock.png b/src/splash-plugins/fade-in/lock.png
similarity index 100%
rename from src/splash-plugins/fedora-fade-in/lock.png
rename to src/splash-plugins/fade-in/lock.png

diff --git a/src/splash-plugins/fedora-fade-in/plugin.c b/src/splash-plugins/fade-in/plugin.c
similarity index 100%
rename from src/splash-plugins/fedora-fade-in/plugin.c
rename to src/splash-plugins/fade-in/plugin.c

diff --git a/src/splash-plugins/fedora-fade-in/star.png b/src/splash-plugins/fade-in/star.png
similarity index 100%
rename from src/splash-plugins/fedora-fade-in/star.png
rename to src/splash-plugins/fade-in/star.png

diff --git a/src/splash-plugins/fedora-fade-in/Makefile.am b/src/splash-plugins/fedora-fade-in/Makefile.am
deleted file mode 100644 (file)
index ec4c09f..0000000
--- a/src/splash-plugins/fedora-fade-in/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(srcdir)/../../libply                                           \
-           -I$(srcdir)/../..                                                  \
-           -I$(srcdir)/..                                                     \
-           -I$(srcdir)
-
-plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = fedora-fade-in.la
-
-fedora_fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"
-fedora_fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
-fedora_fade_in_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la
-fedora_fade_in_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h         \
-                            $(srcdir)/../../ply-window.h                     \
-                            $(srcdir)/../../ply-window.c                     \
-                            $(srcdir)/plugin.c
-
-plymouthdir = $(datadir)/plymouth/fedora-fade-in
-plymouth_DATA = star.png bullet.png entry.png lock.png
-
-EXTRA_DIST = $(plymouth_DATA)
-MAINTAINERCLEANFILES = Makefile.in