[muffin] patch to remove unused binaries to clean debug package
leigh123linux
leigh123linux at fedoraproject.org
Thu May 15 08:42:09 UTC 2014
commit 9e6fb719c457a295285afe85a36c6038d2bffdd5
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Thu May 15 09:41:55 2014 +0100
patch to remove unused binaries to clean debug package
muffin.spec | 13 ++++------
remove_muffin_binary.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 8 deletions(-)
---
diff --git a/muffin.spec b/muffin.spec
index dff35ad..1c4c2d1 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -2,7 +2,7 @@
Name: muffin
Version: 2.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
@@ -19,6 +19,7 @@ Patch0: automake.patch
# https://github.com/linuxmint/muffin/commit/19397761a8b57823b236320f8da9a706bbf09d79
# to fix https://bugzilla.redhat.com/show_bug.cgi?id=1082118
Patch1: revert_ibus.patch
+Patch2: remove_muffin_binary.patch
BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
BuildRequires: pkgconfig(sm)
@@ -77,11 +78,6 @@ make %{?_smp_mflags} V=1
#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la
-# Remove Muffin binaries and desktop file
-rm %{buildroot}/%{_bindir}/muffin
-rm %{buildroot}/%{_bindir}/muffin-message
-rm %{buildroot}/%{_datadir}/applications/muffin.desktop
-
%find_lang %{name}
%post -p /sbin/ldconfig
@@ -101,8 +97,6 @@ fi
%{_libdir}/muffin/
%{_datadir}/GConf/gsettings/muffin-schemas.convert
%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
-%exclude %{_mandir}/man1/muffin.1.gz
-%exclude %{_mandir}/man1/muffin-message.1.gz
%files devel
%{_bindir}/muffin-theme-viewer
@@ -115,6 +109,9 @@ fi
%{_mandir}/man1/muffin-window-demo.1.*
%changelog
+* Thu May 15 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.3-3
+- patch to remove unused binaries to clean debug package
+
* Wed May 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.3-2
- remove unused binaries (bz 1097542)
diff --git a/remove_muffin_binary.patch b/remove_muffin_binary.patch
new file mode 100644
index 0000000..dc752f3
--- /dev/null
+++ b/remove_muffin_binary.patch
@@ -0,0 +1,53 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -197,7 +197,7 @@ libmuffininclude_HEADERS = \
+ muffin_theme_viewer_SOURCES= \
+ ui/theme-viewer.c
+
+-bin_PROGRAMS=muffin muffin-theme-viewer
++bin_PROGRAMS=muffin-theme-viewer
+
+ muffin_SOURCES = core/muffin.c
+ muffin_LDADD = $(MUFFIN_LIBS) libmuffin.la -lclutter-glx-1.0
+@@ -257,13 +257,6 @@ testgradient_LDADD = $(MUFFIN_LIBS) libm
+ testasyncgetprop_LDADD = $(MUFFIN_LIBS)
+
+
+- at INTLTOOL_DESKTOP_RULE@
+-
+-desktopfilesdir=$(datadir)/applications
+-desktopfiles_in_files=muffin.desktop.in
+-desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+-desktopfiles_DATA = $(desktopfiles_files)
+-
+ gsettings_SCHEMAS = org.cinnamon.muffin.gschema.xml
+ @INTLTOOL_XML_NOMERGE_RULE@
+ @GSETTINGS_RULES@
+@@ -279,7 +272,6 @@ VARIABLES=stock_maximize_data $(srcdir)/
+ BUILT_SOURCES = inlinepixbufs.h
+ CLEANFILES = \
+ inlinepixbufs.h \
+- muffin.desktop \
+ org.cinnamon.muffin.gschema.xml \
+ $(xml_DATA) \
+ $(muffin_built_sources) \
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -20,7 +20,7 @@ muffin_mag_SOURCES= \
+ muffin_grayscale_SOURCES= \
+ muffin-grayscale.c
+
+-bin_PROGRAMS=muffin-message muffin-window-demo
++bin_PROGRAMS=muffin-window-demo
+
+ ## cheesy hacks I use, don't really have any business existing. ;-)
+ noinst_PROGRAMS=muffin-mag muffin-grayscale
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -1,4 +1,4 @@
+-man_MANS = muffin.1 muffin-theme-viewer.1 \
+- muffin-window-demo.1 muffin-message.1
++man_MANS = muffin-theme-viewer.1 \
++ muffin-window-demo.1
+
+ EXTRA_DIST = $(man_MANS)
More information about the scm-commits
mailing list