Browse code
Adding new ostree package list for OStree-Server installaton option. Vim fixed for color and syntax profile. Fixed httpd to place files in proper places and added new service file.
Touseef Liaqat authored on 2015/07/16 17:10:04Showing 4 changed files
- SPECS/httpd/httpd.spec
- SPECS/vim/vim.spec
- common/data/build_install_options_all.json
- common/data/packages_ostree_server.json
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache HTTP Server |
| 2 | 2 |
Name: httpd |
| 3 | 3 |
Version: 2.4.12 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://httpd.apache.org/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -21,27 +21,63 @@ Requires: openssl |
| 21 | 21 |
%description |
| 22 | 22 |
The Apache HTTP Server. |
| 23 | 23 |
|
| 24 |
+%package devel |
|
| 25 |
+Summary: Header files for httpd |
|
| 26 |
+Group: Applications/System |
|
| 27 |
+Requires: httpd |
|
| 28 |
+%description devel |
|
| 29 |
+These are the header files of httpd. |
|
| 30 |
+ |
|
| 31 |
+%package docs |
|
| 32 |
+Summary: Help files for httpd |
|
| 33 |
+Group: Applications/System |
|
| 34 |
+Requires: httpd |
|
| 35 |
+%description docs |
|
| 36 |
+These are the help files of httpd. |
|
| 37 |
+ |
|
| 24 | 38 |
%prep |
| 25 | 39 |
%setup -q |
| 26 | 40 |
%build |
| 27 |
-./configure --enable-authnz-fcgi \ |
|
| 41 |
+./configure --prefix=%{_sysconfdir}/httpd \
|
|
| 42 |
+ --exec-prefix=%{_prefix} \
|
|
| 43 |
+ --bindir=%{_bindir} \
|
|
| 44 |
+ --sbindir=%{_sbindir} \
|
|
| 45 |
+ --mandir=%{_mandir} \
|
|
| 46 |
+ --libdir=%{_libdir} \
|
|
| 47 |
+ --sysconfdir=%{_sysconfdir}/httpd/conf \
|
|
| 48 |
+ --includedir=%{_includedir}/httpd \
|
|
| 49 |
+ --libexecdir=%{_libdir}/httpd/modules \
|
|
| 50 |
+ --enable-authnz-fcgi \ |
|
| 28 | 51 |
--enable-mods-shared="all cgi" \ |
| 29 | 52 |
--enable-mpms-shared=all \ |
| 30 |
- --enable-suexec=shared \ |
|
| 31 | 53 |
--with-apr=%{_prefix} \
|
| 32 |
- --with-apr-util=%{_prefix} \
|
|
| 33 |
- --with-suexec-bin=/usr/lib/httpd/suexec \ |
|
| 34 |
- --with-suexec-caller=apache \ |
|
| 35 |
- --with-suexec-docroot=/srv/www \ |
|
| 36 |
- --with-suexec-logfile=/var/log/httpd/suexec.log \ |
|
| 37 |
- --with-suexec-uidmin=100 \ |
|
| 38 |
- --with-suexec-userdir=public_html |
|
| 54 |
+ --with-apr-util=%{_prefix}
|
|
| 39 | 55 |
|
| 40 | 56 |
make %{?_smp_mflags}
|
| 41 | 57 |
|
| 42 | 58 |
%install |
| 43 |
-make DESTDIR=%{buildroot} install &&
|
|
| 59 |
+make DESTDIR=%{buildroot} install
|
|
| 60 |
+ |
|
| 61 |
+install -vdm755 %{buildroot}/usr/lib/systemd/system
|
|
| 62 |
+ |
|
| 63 |
+cat << EOF >> %{buildroot}/usr/lib/systemd/system/httpd.service
|
|
| 64 |
+[Unit] |
|
| 65 |
+Description=The Apache HTTP Server |
|
| 66 |
+After=network.target remote-fs.target nss-lookup.target |
|
| 67 |
+ |
|
| 68 |
+[Service] |
|
| 69 |
+Type=notify |
|
| 70 |
+ |
|
| 71 |
+ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND |
|
| 72 |
+ExecReload=/usr/sbin/httpd $OPTIONS -k graceful |
|
| 73 |
+KillSignal=SIGWINCH |
|
| 74 |
+KillMode=mixed |
|
| 75 |
+Restart=always |
|
| 76 |
+ |
|
| 77 |
+[Install] |
|
| 78 |
+WantedBy=multi-user.target |
|
| 44 | 79 |
|
| 80 |
+EOF |
|
| 45 | 81 |
|
| 46 | 82 |
%post |
| 47 | 83 |
/sbin/ldconfig |
| ... | ... |
@@ -53,11 +89,6 @@ if ! getent passwd apache >/dev/null; then |
| 53 | 53 |
-s /bin/false -u 25 apache |
| 54 | 54 |
fi |
| 55 | 55 |
|
| 56 |
-mv -v /usr/sbin/suexec /usr/lib/httpd/suexec |
|
| 57 |
-chgrp apache /usr/lib/httpd/suexec && |
|
| 58 |
-chmod 4754 /usr/lib/httpd/suexec && |
|
| 59 |
-chown -v -R apache:apache /srv/www |
|
| 60 |
- |
|
| 61 | 56 |
%postun |
| 62 | 57 |
/sbin/ldconfig |
| 63 | 58 |
if getent passwd apache >/dev/null; then |
| ... | ... |
@@ -67,10 +98,30 @@ if getent group apache >/dev/null; then |
| 67 | 67 |
groupdel apache |
| 68 | 68 |
fi |
| 69 | 69 |
|
| 70 |
+%files devel |
|
| 71 |
+%defattr(-,root,root) |
|
| 72 |
+%{_includedir}/*
|
|
| 73 |
+ |
|
| 74 |
+%files docs |
|
| 75 |
+%defattr(-,root,root) |
|
| 76 |
+%{_sysconfdir}/httpd/manual/*
|
|
| 77 |
+ |
|
| 70 | 78 |
%files |
| 71 | 79 |
%defattr(-,root,root) |
| 72 |
-/usr/local/* |
|
| 80 |
+%{_libdir}/*
|
|
| 81 |
+%{_bindir}/*
|
|
| 82 |
+%{_sbindir}/*
|
|
| 83 |
+%{_datadir}/*
|
|
| 84 |
+%{_sysconfdir}/httpd/build/*
|
|
| 85 |
+%{_sysconfdir}/httpd/cgi-bin/*
|
|
| 86 |
+%{_sysconfdir}/httpd/conf/*
|
|
| 87 |
+%{_sysconfdir}/httpd/error/*
|
|
| 88 |
+%{_sysconfdir}/httpd/htdocs/*
|
|
| 89 |
+%{_sysconfdir}/httpd/icons/*
|
|
| 90 |
+ |
|
| 73 | 91 |
|
| 74 | 92 |
%changelog |
| 93 |
+* Thu Jul 16 2015 Touseef Liaqat <tliaqat@vmware.com> 2.4.12-2 |
|
| 94 |
+- Added service file. Changed installation paths. |
|
| 75 | 95 |
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.4.12-1 |
| 76 | 96 |
- Initial build. First version |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Text editor |
| 4 | 4 |
Name: vim |
| 5 | 5 |
Version: 7.4 |
| 6 |
-Release: 3%{?dist}
|
|
| 6 |
+Release: 4%{?dist}
|
|
| 7 | 7 |
License: Charityware |
| 8 | 8 |
URL: http://www.vim.org |
| 9 | 9 |
Group: Applications/Editors |
| ... | ... |
@@ -54,7 +54,6 @@ EOF |
| 54 | 54 |
|
| 55 | 55 |
%files extra |
| 56 | 56 |
%defattr(-,root,root) |
| 57 |
-%config(noreplace) /etc/vimrc |
|
| 58 | 57 |
%{_bindir}/vimtutor
|
| 59 | 58 |
%{_bindir}/xxd
|
| 60 | 59 |
%{_mandir}/*/*
|
| ... | ... |
@@ -62,6 +61,7 @@ EOF |
| 62 | 62 |
%{_datarootdir}/vim/vim74/autoload/*
|
| 63 | 63 |
%{_datarootdir}/vim/vim74/bugreport.vim
|
| 64 | 64 |
%{_datarootdir}/vim/vim74/colors/*
|
| 65 |
+%exclude %{_datarootdir}/vim/vim74/colors/desert.vim
|
|
| 65 | 66 |
%{_datarootdir}/vim/vim74/compiler/*
|
| 66 | 67 |
%{_datarootdir}/vim/vim74/delmenu.vim
|
| 67 | 68 |
%{_datarootdir}/vim/vim74/evim.vim
|
| ... | ... |
@@ -86,6 +86,7 @@ EOF |
| 86 | 86 |
%{_datarootdir}/vim/vim74/scripts.vim
|
| 87 | 87 |
%{_datarootdir}/vim/vim74/spell/*
|
| 88 | 88 |
%{_datarootdir}/vim/vim74/syntax/*
|
| 89 |
+%exclude %{_datarootdir}/vim/vim74/syntax/syntax.vim
|
|
| 89 | 90 |
%{_datarootdir}/vim/vim74/tools/*
|
| 90 | 91 |
%{_datarootdir}/vim/vim74/tutor/*
|
| 91 | 92 |
%{_datarootdir}/vim/vim74/lang/*.vim
|
| ... | ... |
@@ -130,6 +131,9 @@ EOF |
| 130 | 130 |
|
| 131 | 131 |
%files |
| 132 | 132 |
%defattr(-,root,root) |
| 133 |
+%config(noreplace) /etc/vimrc |
|
| 134 |
+%{_datarootdir}/vim/vim74/colors/desert.vim
|
|
| 135 |
+%{_datarootdir}/vim/vim74/syntax/syntax.vim
|
|
| 133 | 136 |
%{_bindir}/ex
|
| 134 | 137 |
%{_bindir}/vi
|
| 135 | 138 |
%{_bindir}/view
|
| ... | ... |
@@ -139,6 +143,8 @@ EOF |
| 139 | 139 |
%{_bindir}/vimdiff
|
| 140 | 140 |
|
| 141 | 141 |
%changelog |
| 142 |
+* Thu Jul 16 2015 Touseef Liaqat <tliaqat@vmware.com> 7.4-3 |
|
| 143 |
+- Added profile related files in minimal vim package. |
|
| 142 | 144 |
* Tue Jun 30 2015 Touseef Liaqat <tliaqat@vmware.com> 7.4-3 |
| 143 | 145 |
- Pack extra files separately, to make vim package small. |
| 144 | 146 |
* Fri Jun 19 2015 Alexey Makhalov <amakhalov@vmware.com> 7.4-2 |
| ... | ... |
@@ -24,8 +24,20 @@ |
| 24 | 24 |
"visible" : true, |
| 25 | 25 |
"include" : "minimal" |
| 26 | 26 |
}, |
| 27 |
+ "ostree_host" : {
|
|
| 28 |
+ "title" : "4. Photon OSTree Host", |
|
| 29 |
+ "file" : "packages_ostree_host.json", |
|
| 30 |
+ "visible" : true, |
|
| 31 |
+ "include" : "none" |
|
| 32 |
+ }, |
|
| 33 |
+ "ostree_host" : {
|
|
| 34 |
+ "title" : "5. Photon OSTree Server", |
|
| 35 |
+ "file" : "packages_ostree_server.json", |
|
| 36 |
+ "visible" : true, |
|
| 37 |
+ "include" : "minimal" |
|
| 38 |
+ }, |
|
| 27 | 39 |
"extra" : {
|
| 28 |
- "title" : "Extra packages not installed.", |
|
| 40 |
+ "title" : "Extra packages not installed but packed in ISO.", |
|
| 29 | 41 |
"file" : "packages_extra.json", |
| 30 | 42 |
"visible" : false, |
| 31 | 43 |
"include" : "none" |
| 32 | 44 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,9 @@ |
| 0 |
+{
|
|
| 1 |
+ "packages":["bash", "bzip2", "dracut", "dracut-tools", |
|
| 2 |
+ "glib", "glibc", "gpgme", "gpgme-devel", "hawkey", "json-glib", |
|
| 3 |
+ "libarchive", "libarchive-devel", "libassuan", "libcap", "libffi", |
|
| 4 |
+ "libgcc", "libgpg-error", "libgsystem", "libhif", "libhif-devel", |
|
| 5 |
+ "librepo", "librepo-devel", "libsolv", "libsoup", "libsoup-devel", |
|
| 6 |
+ "libxml2", "mkinitcpio", "openssl-devel", "ostree", "pcre", "rpm", |
|
| 7 |
+ "sqlite-autoconf", "systemd", "xz", "yum", "zlib", "ostree", "rpm-ostree"] |
|
| 8 |
+} |