1. photon
  2. Commit 310f2324388d156dcb0f3eeb1008cf973e066287
Browse code

Fix regression caused by rpm update

Change-Id: Id7b80b79d18c1819c909d6982e577f6f7a510937
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3923
Reviewed-by: gerrit-photon <photon-checkins@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Alexey Makhalov authored on 2017/10/02 15:13:56
Showing 8 changed files
SPECS/backward-cpp/backward-cpp.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:        Pretty stack trace printer for C++.
2 5 
 Name:           backward-cpp
3 6 
 Version:        1.3
SPECS/crash/crash.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Name:          crash
2 5 
 Version:       7.1.4
3 6 
 Release:       3%{?dist}
SPECS/initramfs/initramfs.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:	initramfs
2 5 
 Name:		initramfs
3 6 
 Version:	1.0
SPECS/iotop/iotop.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:	Iotop is a Python program with a top like UI used to show the processes and their corresponding IO activity.
2 5 
 Name:		iotop
3 6 
 Version:	0.6
SPECS/ipmitool/ipmitool.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:        ipmitool - Utility for IPMI control
2 5 
 Name:           ipmitool
3 6 
 Version:        1.8.18
SPECS/python-pbr/python-pbr.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 5 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 6
SPECS/spdlog/spdlog.spec
History View file @ 310f232
... ... 
@@ -1,3 +1,6 @@
1 
+# FIXME: noarch or generate debuginfo
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:	Very fast, header only, C++ logging library.
2 5 
 Name:		spdlog
3 6 
 Version:	0.13.0
SPECS/tcsh/tcsh.spec
History View file @ 310f232
... ... 
@@ -5,7 +5,7 @@
5 5 
 Summary:	An enhanced version of csh, the C shell
6 6 
 Name:		tcsh
7 7 
 Version:	6.19.00
8 
-Release:	6%{?dist}
8 
+Release:	7%{?dist}
9 9 
 License:	BSD
10 10 
 Group:		System Environment/Shells
11 11 
 Source:		http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.gz
... ... 
@@ -38,7 +38,6 @@ sed -i -e 's|\$\*|#&|' -e 's|fR/g|&m|' tcsh.man2html &&
38 38
39 39 
 %configure --prefix=%{_prefix}
40 40 
 make %{?_smp_mflags} all
41 
-make %{?_smp_mflags} -C nls catalogs
42 41
43 42 
 %install
44 43 
 mkdir -p %{buildroot}%{_mandir}/man1 %{buildroot}%{_bindir}
... ... 
@@ -49,9 +48,9 @@ ln -sf tcsh.1 %{buildroot}%{_mandir}/man1/csh.1
49 49
50 50 
 while read lang language ; do
51 51 
 	dest=%{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
52 
-	if test -f tcsh.$language.cat ; then
52 
+	if test -f nls/$language.cat ; then
53 53 
 		mkdir -p $dest
54 
-		install -p -m 644 tcsh.$language.cat $dest/tcsh
54 
+		install -p -m 644 nls/$language.cat $dest/tcsh
55 55 
 		echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
56 56 
 	fi
57 57 
 done > tcsh.lang << _EOF
... ... 
@@ -115,6 +114,8 @@ fi
115 115 
 %{_mandir}/man1/*.1*
116 116
117 117 
 %changelog
118 
+*   Mon Oct 2 2017 Alexey Makhalov <amakhalov@vmware.com> 6.19.00-7
119 
+-   Ensure nonempty lang
118 120 
 *   Mon Apr 3 2017 Alexey Makhalov <amakhalov@vmware.com> 6.19.00-6
119 121 
 -   Use specified version of ncurses wich has long chtype and mmask_t
120 122 
     (see ncurses changelog)