[system-config-language] patchd Makefile
Pravin Satpute
pravins at fedoraproject.org
Mon Nov 26 10:03:23 UTC 2012
commit 4a318323ef2cb69a1b9167d5542ea718c72b7813
Author: प्रविण सातपुते <psatpute at redhat.com>
Date: Mon Nov 26 15:32:49 2012 +0530
patchd Makefile
bug-879472.patch | 30 +++++++++++++++++++++++-------
system-config-language.spec | 14 +++++---------
2 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/bug-879472.patch b/bug-879472.patch
index f06b885..68da1a8 100644
--- a/bug-879472.patch
+++ b/bug-879472.patch
@@ -1,13 +1,29 @@
-diff -rup system-config-language-1.3.5-old/Makefile system-config-language-1.3.5/Makefile
---- system-config-language-1.3.5-old/Makefile 2012-11-23 12:36:26.967196936 +0530
-+++ system-config-language-1.3.5/Makefile 2012-11-23 14:52:05.241382634 +0530
-@@ -31,7 +31,7 @@ install: ${PKGNAME}.desktop
+diff -rup system-config-language-1.3.5/Makefile system-config-language-1.3.5_mod/Makefile
+--- system-config-language-1.3.5/Makefile 2010-08-26 15:01:06.000000000 +0530
++++ system-config-language-1.3.5_mod/Makefile 2012-11-26 14:56:01.591312124 +0530
+@@ -31,14 +31,18 @@ install: ${PKGNAME}.desktop
# mkdir -p $(INSTROOT)/usr/share/firstboot/modules
mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
- install src/*.py $(INSTROOT)$(PKGDATADIR)
+- install src/locale-list $(INSTROOT)$(PKGDATADIR)
+- install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
+ install -m 0644 src/*.py $(INSTROOT)$(PKGDATADIR)
- install src/locale-list $(INSTROOT)$(PKGDATADIR)
- install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
++ install -m 0755 src/language_gui.py $(INSTROOT)$(PKGDATADIR)
++ install -m 0755 src/language_backend.py $(INSTROOT)$(PKGDATADIR)
++ install -m 0755 src/system-config-language.py $(INSTROOT)$(PKGDATADIR)
++
++ install -m 0644 src/locale-list $(INSTROOT)$(PKGDATADIR)
++ install -m 0755 src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
install ${PKGNAME}.desktop $(INSTROOT)/usr/share/applications/${PKGNAME}.desktop
-Only in system-config-language-1.3.5: Makefile~
+- install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
+- install ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}
+- install pixmaps/${PKGNAME}.png $(INSTROOT)$(PKGDATADIR)/pixmaps/${PKGNAME}.png
+- install pixmaps/${PKGNAME}.png $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
++ install -m 0644 ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}
++ install -m 0644 ${PKGNAME}.console $(INSTROOT)$(SECURITY_DIR)/${PKGNAME}
++ install -m 0644 pixmaps/${PKGNAME}.png $(INSTROOT)$(PKGDATADIR)/pixmaps/${PKGNAME}.png
++ install -m 0644 pixmaps/${PKGNAME}.png $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
+ ln -sf consolehelper $(INSTROOT)/usr/bin/${PKGNAME}
+ # ln -sf $(PKGDATADIR)/language_gui.py $(INSTROOT)/usr/share/firstboot/modules/language.py
+ for d in $(SUBDIRS); do \
diff --git a/system-config-language.spec b/system-config-language.spec
index ebca56f..32f44ab 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -1,7 +1,7 @@
Summary: A graphical interface for modifying the system language
Name: system-config-language
Version: 1.3.5
-Release: 17%{?dist}
+Release: 18%{?dist}
URL: https://fedorahosted.org/system-config-language/
Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
Patch0: s-c-l-624008.patch
@@ -49,14 +49,7 @@ make %{?_smp_mflags}
%install
make INSTROOT=$RPM_BUILD_ROOT install
-install $RPM_BUILD_DIR/system-config-language-%{version}/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
-
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/yumhelpers.glade
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/system-config-language
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/system-config-language
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/pixmaps/system-config-language.png
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/system-config-language.png
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/locale-list
+install -m 0644 $RPM_BUILD_DIR/system-config-language-%{version}/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
desktop-file-install --vendor system --delete-original \
@@ -93,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
%changelog
+* Mon Nov 26 2012 Pravin Satpute <psatpute at redhat.com> - 1.3.5-18
+- Patched Makefile
+
* Mon Nov 26 2012 Anish Patil <apatil at redhat.com> - 1.3.5-17
- Fixed Requires python-devel issue
More information about the scm-commits
mailing list