Browse code

fix symlinks

Change-Id: I236ffbf11db1ce538015fe2bac4b18d8be71d39b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2865
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Bo Gan authored on 2017/06/05 09:41:39
Showing 4 changed files
... ...
@@ -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:	7%{?dist}
4
+Release:	8%{?dist}
5 5
 License:	BSD
6 6
 URL:		http://www.bzip.org/
7 7
 Group:		System Environment/Base
... ...
@@ -46,8 +46,8 @@ install -vdm 0755 %{buildroot}/%{_lib}
46 46
 install -vdm 0755 %{buildroot}/bin
47 47
 cp -av libbz2.so* %{buildroot}/%{_lib}
48 48
 install -vdm 755 %{buildroot}%{_libdir}
49
-ln -sv %{_lib}/libbz2.so.%{version} %{buildroot}%{_lib}/libbz2.so
50
-ln -sv %{_lib}/libbz2.so.%{version} %{buildroot}%{_lib}/libbz2.so.1
49
+ln -sv libbz2.so.%{version} %{buildroot}%{_lib}/libbz2.so
50
+ln -sv libbz2.so.%{version} %{buildroot}%{_lib}/libbz2.so.1
51 51
 rm -v %{buildroot}%{_bindir}/{bunzip2,bzcat}
52 52
 ln -sv bzip2 %{buildroot}/usr/bin/bunzip2
53 53
 ln -sv bzip2 %{buildroot}/usr/bin/bzcat
... ...
@@ -87,6 +87,8 @@ make %{?_smp_mflags} check
87 87
 %{_lib}/libbz2.so.*
88 88
 
89 89
 %changelog
90
+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 1.0.6-8
91
+-   Fix symlink
90 92
 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.6-7
91 93
 -   Added -libs subpackage
92 94
 *   Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.6-6
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Libraries for terminal handling of character screens
2 2
 Name:		ncurses
3 3
 Version:	6.0
4
-Release:	6%{?dist}
4
+Release:	7%{?dist}
5 5
 License:	MIT
6 6
 URL:		http://www.gnu.org/software/ncurses
7 7
 Group:		Applications/System
... ...
@@ -89,9 +89,9 @@ ln -sfv libncurses.so %{buildroot}%{_libdir}/libcurses.so
89 89
 ln -sfv libncursesw.a %{buildroot}%{_libdir}/libcursesw.a
90 90
 ln -sfv libncurses.a %{buildroot}%{_libdir}/libcurses.a
91 91
 install -vdm 755  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
92
-ln -sv %{_lib}/libncursesw.so.6.0 %{buildroot}%{_libdir}/libncurses.so.6
92
+ln -sv libncursesw.so.6.0 %{buildroot}%{_libdir}/libncurses.so.6
93
+ln -sv libncursesw.so.5.9 %{buildroot}%{_libdir}/libncurses.so.5
93 94
 cp -v -R doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}
94
-ln -sv %{_lib}/libncursesw.so.5.9 %{buildroot}%{_libdir}/libncurses.so.5
95 95
 
96 96
 %check
97 97
 cd test
... ...
@@ -170,6 +170,8 @@ make
170 170
 %exclude %{_datadir}/terminfo/l/linux
171 171
 
172 172
 %changelog
173
+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 6.0-7
174
+-   Fix symlink
173 175
 *   Wed Mar 29 2017 Alexey Makhalov <amakhalov@vmware.com> 6.0-6
174 176
 -   --with-chtype=long --with-mmask-t=long to avoid type clashes (1838226)
175 177
 *   Wed Nov 23 2016 Alexey Makhalov <amakhalov@vmware.com> 6.0-5
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Management tools and libraries relating to cryptography
2 2
 Name:           openssl
3 3
 Version:        1.0.2k
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        OpenSSL
6 6
 URL:            http://www.openssl.org
7 7
 Group:          System Environment/Security
... ...
@@ -69,8 +69,8 @@ make
69 69
 %install
70 70
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
71 71
 make INSTALL_PREFIX=%{buildroot} MANDIR=/usr/share/man MANSUFFIX=ssl install
72
-ln -sf %{_libdir}/libssl.so.1.0.0 %{buildroot}%{_libdir}/libssl.so.1.0.2
73
-ln -sf %{_libdir}/libcrypto.so.1.0.0 %{buildroot}%{_libdir}/libcrypto.so.1.0.2
72
+ln -sf libssl.so.1.0.0 %{buildroot}%{_libdir}/libssl.so.1.0.2
73
+ln -sf libcrypto.so.1.0.0 %{buildroot}%{_libdir}/libcrypto.so.1.0.2
74 74
 
75 75
 %check
76 76
 make %{?_smp_mflags} tests
... ...
@@ -112,6 +112,8 @@ rm -rf %{buildroot}/*
112 112
 /%{_bindir}/c_rehash
113 113
 
114 114
 %changelog
115
+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 1.0.2k-2
116
+-   Fix symlink
115 117
 *   Fri Apr 07 2017 Anish Swaminathan <anishs@vmware.com> 1.0.2k-1
116 118
 -   Upgrade to 1.0.2k
117 119
 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0.2j-3
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        A high-level scripting language
2 2
 Name:           python3
3 3
 Version:        3.6.1
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        PSF
6 6
 URL:            http://www.python.org/
7 7
 Group:          System Environment/Programming
... ...
@@ -108,6 +108,7 @@ make %{?_smp_mflags}
108 108
 make DESTDIR=%{buildroot} install
109 109
 chmod -v 755 %{buildroot}%{_libdir}/libpython3.6m.so.1.0
110 110
 %{_fixperms} %{buildroot}/*
111
+ln -sf libpython3.6m.so %{buildroot}%{_libdir}/libpython3.6.so
111 112
 
112 113
 # Remove unused stuff
113 114
 find %{buildroot}%{_libdir} -name '*.pyc' -delete
... ...
@@ -118,19 +119,8 @@ rm %{buildroot}%{_bindir}/2to3
118 118
 %check
119 119
 make  %{?_smp_mflags} test
120 120
 
121
-%post
122
-/sbin/ldconfig
123
-ln -sf %{_libdir}/libpython3.6m.so %{_libdir}/libpython3.6.so
124
-
125
-%post libs
126
-export PYTHONHOME=/usr
127
-export PYTHONPATH=/usr/lib/python3.6
128
-
129
-%postun
130
-if [ $1 -eq 0 ] ; then
131
-    rm %{_libdir}/libpython3.6.so
132
-fi
133
-/sbin/ldconfig
121
+%post -p /sbin/ldconfig
122
+%postun -p /sbin/ldconfig
134 123
 
135 124
 %clean
136 125
 rm -rf %{buildroot}/*
... ...
@@ -148,6 +138,7 @@ rm -rf %{buildroot}/*
148 148
 %dir %{_libdir}/python3.6/site-packages
149 149
 
150 150
 %{_libdir}/libpython3.so
151
+%{_libdir}/libpython3.6.so
151 152
 %{_libdir}/libpython3.6m.so
152 153
 %{_libdir}/libpython3.6m.so.1.0
153 154
 %{_libdir}/pkgconfig/python-3.6.pc
... ...
@@ -190,6 +181,8 @@ rm -rf %{buildroot}/*
190 190
 %exclude %{_bindir}/idle*
191 191
 
192 192
 %changelog
193
+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 3.6.1-3
194
+-   Fix symlink and script
193 195
 *   Wed May 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.6.1-2
194 196
 -   Exclude idle3.
195 197
 *   Wed Apr 26 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.1-1