Browse code

Merging specs between branch dev and build-dev

Divya Thaluru authored on 2015/06/08 08:50:44
Showing 15 changed files
... ...
@@ -1,13 +1,16 @@
1 1
 Summary:	The package automatically configure source code
2 2
 Name:		autoconf
3 3
 Version:	2.69
4
-Release:	1%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	GPLv2
6 6
 URL:		http://www.gnu.org/software/autoconf
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9
-Distribution: Photon
10
-Source0:		http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
9
+Distribution: 	Photon
10
+Source0:	http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
11
+Requires:	perl
12
+BuildRequires:	m4
13
+Requires:	m4
11 14
 %description
12 15
 The package contains programs for producing shell scripts that can
13 16
 automatically configure source code.
... ...
@@ -27,5 +30,9 @@ rm -rf %{buildroot}%{_infodir}
27 27
 %{_mandir}/*/*
28 28
 %{_datarootdir}/autoconf/*
29 29
 %changelog
30
+*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.69-3
31
+-	Adding m4 package to build and run time required package 
32
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 2.69-2
33
+-	Adding perl packages to required packages
30 34
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.69-1
31 35
 -	Initial build.	First version
... ...
@@ -1,13 +1,14 @@
1 1
 Summary:	Programs for generating Makefiles
2 2
 Name:		automake
3 3
 Version:	1.14.1
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	GPLv2+
6 6
 URL:		http://www.gnu.org/software/automake/
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9
-Distribution: Photon
10
-Source0:		http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
9
+Distribution: 	Photon
10
+Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
11
+BuildRequires:	autoconf
11 12
 %description
12 13
 Contains programs for generating Makefiles for use with Autoconf.
13 14
 %prep
... ...
@@ -33,5 +34,7 @@ rm -rf %{buildroot}%{_infodir}
33 33
 %{_defaultdocdir}/%{name}-%{version}/*
34 34
 %{_mandir}/*/*
35 35
 %changelog
36
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 1.14.1-2
37
+-	Adding autoconf package to build time requires packages
36 38
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.14.1-1
37 39
 -	Initial build. First version
... ...
@@ -1,13 +1,17 @@
1 1
 Summary:	Contains a parser generator
2 2
 Name:		bison
3 3
 Version:	3.0.2
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.gnu.org/software/bison
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10 10
 Source0:	http://ftp.gnu.org/gnu/bison/%{name}-%{version}.tar.xz
11
+BuildRequires:	m4
12
+Requires:	m4
13
+BuildRequires:	flex
14
+Requires:	flex
11 15
 %description
12 16
 This package contains a parser generator
13 17
 %prep
... ...
@@ -69,5 +73,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
69 69
 %lang(zh_TW) %{_datarootdir}/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
70 70
 %{_mandir}/*/*
71 71
 %changelog
72
+*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 3.0.2-2
73
+-	Adding m4, flex package to build and run time required package 
72 74
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.0.2-1
73 75
 -	Initial build. First version.
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Contains programs for compressing and decompressing files
2 2
 Name:		bzip2
3 3
 Version:	1.0.6
4
-Release:	2%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	BSD
6 6
 URL:		http://www.bzip.org/
7 7
 Group:		System Environment/Base
... ...
@@ -15,6 +15,7 @@ decompressing files.  Compressing text files with bzip2 yields a much better
15 15
 compression percentage than with the traditional gzip.
16 16
 %package	devel
17 17
 Summary:	Header and development files for bzip2
18
+Requires:	bzip2
18 19
 %description	devel
19 20
 It contains the libraries and header files to create applications 
20 21
 %prep
... ...
@@ -72,7 +73,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
72 72
 %files devel
73 73
 %{_includedir}/bzlib.h
74 74
 %changelog
75
-*   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2
76
--   Update according to UsrMove.
75
+*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.6-3
76
+-	Adding bzip2 package run time required package for bzip2-devel package 
77
+*	Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2
78
+-	Update according to UsrMove.
77 79
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.0.6-1
78 80
 -	Initial build.	First version
... ...
@@ -1,13 +1,14 @@
1 1
 Summary:	Programs that show the differences between files or directories
2 2
 Name:		diffutils
3 3
 Version:	3.3
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.gnu.org/software/diffutils
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9
-Distribution: Photon
10
-Source0:		http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz
9
+Distribution:	Photon
10
+Source0:	http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz
11
+BuildRequires:	coreutils
11 12
 %description
12 13
 The Diffutils package contains programs that show the
13 14
 differences between files or directories.
... ...
@@ -30,5 +31,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
30 30
 %{_bindir}/*
31 31
 %{_mandir}/*/*
32 32
 %changelog
33
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 3.3-2
34
+-	Adding coreutils package to build requires
33 35
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.3-1
34 36
 -	Initial build.	First version
... ...
@@ -1,13 +1,15 @@
1 1
 Summary:	A utility for generating programs that recognize patterns in text
2 2
 Name:		flex
3 3
 Version:	2.5.38
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	BSD
6 6
 URL:		http://flex.sourceforge.net
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10 10
 Source0:	http://prdownloads.sourceforge.net/flex/%{name}-%{version}.tar.bz2
11
+BuildRequires:	m4
12
+Requires:	m4
11 13
 %description
12 14
 The Flex package contains a utility for generating programs
13 15
 that recognize patterns in text.
... ...
@@ -49,5 +51,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
49 49
 %{_defaultdocdir}/%{name}-%{version}/*
50 50
 %{_mandir}/*/*
51 51
 %changelog
52
+*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.5.38-2
53
+-	Adding m4 package to build and run time required package 
52 54
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.5.38-1
53 55
 -	Initial build.	First version
... ...
@@ -124,7 +124,7 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig
124 124
 %{_sysconfdir}/*
125 125
 %ifarch x86_64
126 126
 %{_lib64}/*
127
-/lib64/*
127
+%{_lib64dir}/*
128 128
 %else
129 129
 %{_lib}/*
130 130
 %endif
... ...
@@ -75,8 +75,8 @@ cp -v -R doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}
75 75
 %{_mandir}/man5/*
76 76
 %{_mandir}/man3/*
77 77
 %{_datadir}/terminfo/*
78
-%{_lib}/libncursesw.so.5
79
-%{_lib}/libncursesw.so.5.9
78
+%{_libdir}/libncursesw.so.5
79
+%{_libdir}/libncursesw.so.5.9
80 80
 %{_libdir}/libncurses.so
81 81
 %{_libdir}/libform.so
82 82
 %{_libdir}/libcursesw.so
... ...
@@ -73,8 +73,8 @@ find %{buildroot} -name '*.la' -delete
73 73
 %{_mandir}/man1/watch.1.gz
74 74
 %{_mandir}/man1/ps.1.gz
75 75
 %{_mandir}/man5/sysctl.conf.5.gz
76
-%{_lib}/libprocps.so.3
77
-%{_lib}/libprocps.so.3.0.0
76
+%{_libdir}/libprocps.so.3
77
+%{_libdir}/libprocps.so.3.0.0
78 78
 /sbin/sysctl
79 79
 %files devel
80 80
 %{_includedir}/proc/sig.h
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	A high-level scripting language
2 2
 Name:		python2
3 3
 Version:	2.7.9
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	PSF
6 6
 URL:		http://www.python.org/
7 7
 Group:		System Environment/Programming
... ...
@@ -31,6 +31,7 @@ Requires:	sqlite-autoconf
31 31
 Requires:	expat >= 2.1.0
32 32
 Requires:	libffi >= 3.0.13
33 33
 Requires:	ncurses
34
+Requires:	coreutils
34 35
 BuildRequires:	expat >= 2.1.0
35 36
 BuildRequires:	libffi >= 3.0.13
36 37
 BuildRequires:	sqlite-autoconf
... ...
@@ -183,5 +184,7 @@ rm -rf %{buildroot}/*
183 183
 %{_bindir}/idle*
184 184
 
185 185
 %changelog
186
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.9-2
187
+-	Adding coreutils package to run time required package
186 188
 *	Mon Apr 6 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.9-1
187 189
 -	Initial build.	First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Command-line editing and history capabilities
2 2
 Name:		readline
3 3
 Version:	6.3
4
-Release:	2%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
7 7
 Group:		Applications/System
... ...
@@ -10,6 +10,7 @@ Distribution: 	Photon
10 10
 Source0:	http://ftp.gnu.org/gnu/readline/%{name}-%{version}.tar.gz
11 11
 Patch:		http://www.linuxfromscratch.org/patches/lfs/development/readline-6.3-upstream_fixes-3.patch
12 12
 BuildRequires:	ncurses-devel
13
+Requires:	ncurses
13 14
 %description
14 15
 The Readline package is a set of libraries that offers command-line
15 16
 editing and history capabilities.
... ...
@@ -40,10 +41,10 @@ rm -rf %{buildroot}%{_infodir}
40 40
 %postun	-p /sbin/ldconfig
41 41
 %files
42 42
 %defattr(-,root,root)
43
-%{_lib}/libreadline.so.6
44
-%{_lib}/libhistory.so.6
45
-%{_lib}/libhistory.so.6.3
46
-%{_lib}/libreadline.so.6.3
43
+%{_libdir}/libreadline.so.6
44
+%{_libdir}/libhistory.so.6
45
+%{_libdir}/libhistory.so.6.3
46
+%{_libdir}/libreadline.so.6.3
47 47
 %{_datadir}/%{name}/hist_purgecmd.c
48 48
 %{_datadir}/%{name}/rltest.c
49 49
 %{_datadir}/%{name}/rlversion.c
... ...
@@ -91,7 +92,9 @@ rm -rf %{buildroot}%{_infodir}
91 91
 %{_libdir}/libhistory.so
92 92
 %{_libdir}/libreadline.so
93 93
 %changelog
94
-*   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 6.3-2
95
--   Update according to UsrMove.
94
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 6.3-3
95
+-	Adding ncurses to run time require package
96
+*   	Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 6.3-2
97
+-   	Update according to UsrMove.
96 98
 *	Wed Oct 22 2014 Divya Thaluru <dthaluru@vmware.com> 6.3-1
97 99
 -	Initial build.	First version
... ...
@@ -13,7 +13,6 @@ Source2:	rpm-system-configuring-scripts-2.0.tar.gz
13 13
 #Requires: nspr
14 14
 Requires: 	nss
15 15
 Requires: 	popt
16
-Requires: 	perl-Module-ScanDeps
17 16
 Requires: 	lua
18 17
 Requires:	elfutils-libelf
19 18
 BuildRequires:	python2
... ...
@@ -108,5 +107,7 @@ rm -rf %{buildroot}
108 108
 %{_libdir}/librpm.so
109 109
 
110 110
 %changelog
111
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.11.2-2
112
+-	Removing perl-module-scandeps package from run time required packages
111 113
 *	Tue Jan 13 2015 Divya Thaluru <dthaluru@vmware.com> 4.11.2-1
112 114
 -	Initial build. First version
... ...
@@ -1,14 +1,13 @@
1 1
 Summary:	Reading, writing, and converting info pages
2 2
 Name:		texinfo
3 3
 Version:	5.2
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.gnu.org/software/texinfo/
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10 10
 Source0:	%{name}-%{version}.tar.xz
11
-Requires:	perl-libintl
12 11
 %description
13 12
 The Texinfo package contains programs for reading, writing,
14 13
 and converting info pages.
... ...
@@ -46,5 +45,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
46 46
 %lang(pt.us-ascii) %{_datarootdir}/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo
47 47
 %lang(pt_BR.us-ascii) %{_datarootdir}/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo
48 48
 %changelog
49
+*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 5.2-2
50
+-	Removing perl-libintl package from run-time required packages
49 51
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2-1
50 52
 -	Upgrade version
... ...
@@ -60,8 +60,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
60 60
 %{_bindir}/lzmainfo
61 61
 %{_bindir}/xzgrep
62 62
 %{_bindir}/xzdec
63
-%{_lib}/liblzma.so.5.0.5
64
-%{_lib}/liblzma.so.5
63
+%{_libdir}/liblzma.so.5.0.5
64
+%{_libdir}/liblzma.so.5
65 65
 %{_mandir}/man1/*
66 66
 %{_defaultdocdir}/%{name}-%{version}/*
67 67
 %files devel
... ...
@@ -33,8 +33,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
33 33
 %files
34 34
 %defattr(-,root,root)
35 35
 %{_mandir}/man3/zlib.3.gz
36
-%{_lib}/libz.so.1
37
-%{_lib}/libz.so.1.2.8
36
+%{_libdir}/libz.so.1
37
+%{_libdir}/libz.so.1.2.8
38 38
 %files devel
39 39
 %{_includedir}/zconf.h
40 40
 %{_includedir}/zlib.h