Browse code

Add new versions of rpmostree and ostree packages

Address comments for repmostree

Anish Swaminathan authored on 2015/06/19 07:18:29
Showing 10 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Hawkey
2 2
 Name:		hawkey
3 3
 Version:	2014.1
4
-Release:	2%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	LGPLv2+
6 6
 URL:		http://fedoraproject.org/wiki/Features/Hawkey
7 7
 Source0:	https://github.com/rpm-software-management/hawkey/archive/%{name}-%{version}.tar.gz
... ...
@@ -23,6 +23,7 @@ packages based on the current state of RPMDB and yum repositories.
23 23
 Summary:	A Library providing simplified C and Python API to libsolv
24 24
 Group:		Development/Libraries
25 25
 Requires:	hawkey = %{version}-%{release}
26
+Provides:       pkgconfig(hawkey)
26 27
 
27 28
 %description devel
28 29
 Development files for hawkey.
... ...
@@ -66,6 +67,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
66 66
 %exclude %{python_sitearch}/*
67 67
 
68 68
 %changelog
69
+*	Thu Jun 18 2015 Anish Swaminathan <anishs@vmware.com> 2014.1-3
70
+-	Add pkgconfig Provides directive
69 71
 *   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2014.1.1-2
70 72
 -   Updated group.
71 73
 *	Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 2014.1-1
... ...
@@ -1,33 +1,37 @@
1 1
 # Copied from inside of libhif.<version>.tar.gz
2
+%define libhif_version %{name}-%{name}_0_2_0
2 3
 
3 4
 Summary:   	Simple package manager built on top of hawkey and librepo
4
-Name:      	libhif
5
-Version:   	0.1.7
5
+Name:		libhif
6
+Version:   	0.2.0
6 7
 Release:   	1%{?dist}
7 8
 License:   	LGPLv2+
8 9
 URL:       	https://github.com/hughsie/libhif
9
-Source0:   	http://people.freedesktop.org/~hughsient/releases/libhif-%{version}.tar.gz
10
+Source0:   	http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
10 11
 Vendor:		VMware, Inc.
11 12
 Distribution:	Photon
12 13
 
13
-Requires: 	librepo
14
-Requires: 	libsolv
15
-Requires: 	gobject-introspection
16
-Requires: 	hawkey
17
-Requires: 	glib >= 2.16.1
18
-
19 14
 BuildRequires: 	glib-devel >= 2.16.1
20 15
 BuildRequires: 	libtool
21 16
 BuildRequires: 	gtk-doc
22 17
 BuildRequires: 	gobject-introspection-devel
23 18
 BuildRequires: 	hawkey-devel >= 0.4.6
24 19
 BuildRequires: 	rpm-devel >= 4.11.0
25
-BuildRequires: 	librepo
20
+BuildRequires: 	librepo-devel >= 1.7.11
26 21
 BuildRequires: 	libsolv
27 22
 BuildRequires: 	popt-devel
28 23
 BuildRequires: 	python2-libs
29 24
 BuildRequires:	python2
30 25
 BuildRequires: 	gobject-introspection-python
26
+BuildRequires:	openssl-devel
27
+
28
+Requires:       openssl
29
+Requires:       librepo-devel
30
+Requires: 	libsolv
31
+Requires: 	gobject-introspection
32
+Requires: 	hawkey-devel
33
+Requires: 	rpm-devel
34
+Requires: 	glib >= 2.16.1
31 35
 
32 36
 %description
33 37
 This library provides a simple interface to hawkey and librepo and is currently
... ...
@@ -36,16 +40,17 @@ used by PackageKit and rpm-ostree.
36 36
 %package devel
37 37
 Summary: GLib Libraries and headers for libhif
38 38
 Requires: libhif
39
+Provides: pkgconfig(libhif)
39 40
 
40 41
 %description devel
41 42
 GLib headers and libraries for libhif.
42 43
 
43 44
 %prep
44
-%setup -q -n libhif-%{version}
45
+%setup -q -n %{libhif_version}
45 46
 
46 47
 %build
47 48
 
48
-./autogen.sh \
49
+./autogen.sh --prefix=/usr \
49 50
     LDFLAGS='-L/usr/lib -lrpm -lrepo' \
50 51
         --enable-gtk-doc \
51 52
         --disable-static \
... ...
@@ -56,8 +61,6 @@ make %{?_smp_mflags}
56 56
 
57 57
 %install
58 58
 make install DESTDIR=$RPM_BUILD_ROOT
59
-cp -rf $RPM_BUILD_ROOT/usr/local/* $RPM_BUILD_ROOT/usr/
60
-rm -rf $RPM_BUILD_ROOT/usr/local/*
61 59
 rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la
62 60
 
63 61
 %post -p /sbin/ldconfig
... ...
@@ -77,3 +80,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la
77 77
 %{_datadir}/gtk-doc
78 78
 %{_datadir}/gir-1.0/*.gir
79 79
 
80
+%changelog
81
+*       Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1
82
+-       Updated version
... ...
@@ -1,14 +1,15 @@
1 1
 #dont terminate build for unpackaged files.
2 2
 %define _unpackaged_files_terminate_build 0
3
+%define librepo_name %{name}-%{name}
3 4
 
4 5
 Summary:       	Repodata downloading library
5 6
 Name:          	librepo
6
-Version:       	1.17
7
+Version:       	1.7.15
7 8
 Release:       	1%{?dist}
8 9
 License:       	LGPLv2+
9 10
 URL:           	https://github.com/Tojaj/librepo/
10 11
 Group:         	System Environment/Libraries
11
-Source0:       	%{name}-%{version}.tar.bz2
12
+Source0:       	%{name}-%{version}.tar.gz
12 13
 Vendor:		VMware, Inc.
13 14
 Distribution:	Photon
14 15
 Requires:	curl, gpgme, libassuan, libgpg-error
... ...
@@ -25,24 +26,37 @@ BuildRequires:	python2-tools
25 25
 BuildRequires:	gpgme-devel
26 26
 BuildRequires:	openssl-devel
27 27
 BuildRequires:	attr
28
+
29
+Requires:       openssl-devel
30
+
28 31
 %description
29 32
 A library providing C and Python (libcURL like) API for downloading 
30 33
 linux repository metadata and packages
31 34
 
35
+%package devel
36
+Summary: package config and headers for librepo
37
+Requires: librepo
38
+Provides: pkgconfig(librepo)
39
+
40
+%description devel
41
+Package config and headers for librepo.
42
+
32 43
 %prep
33
-%setup -q
44
+%setup -q -n %{librepo_name}-%{version}
34 45
 
35 46
 %build
36 47
 mkdir build
37 48
 cd build
38
-cmake ..
49
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_prefix}/lib ..
39 50
 make %{?_smp_mflags}
40 51
 
41 52
 %install
42 53
 mkdir -p %{buildroot}%{_libdir}
43 54
 mkdir -p %{buildroot}%{_includedir}/librepo
44
-cp %{_builddir}/%{name}-%{version}/build/librepo/librepo.so* %{buildroot}%{_libdir}
45
-cp %{_builddir}/%{name}-%{version}/librepo/*.h %{buildroot}%{_includedir}/librepo
55
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
56
+cp %{_builddir}/%{librepo_name}-%{version}/build/librepo/librepo.so* %{buildroot}%{_libdir}
57
+cp %{_builddir}/%{librepo_name}-%{version}/build/librepo.pc %{buildroot}%{_libdir}/pkgconfig
58
+cp %{_builddir}/%{librepo_name}-%{version}/librepo/*.h %{buildroot}%{_includedir}/librepo
46 59
 
47 60
 %post 
48 61
 /sbin/ldconfig
... ...
@@ -53,9 +67,14 @@ cp %{_builddir}/%{name}-%{version}/librepo/*.h %{buildroot}%{_includedir}/librep
53 53
 %files
54 54
 %defattr(-,root,root)
55 55
 %{_libdir}/librepo.so*
56
+
57
+%files devel
58
+%{_libdir}/pkgconfig/librepo.pc
56 59
 %{_includedir}/librepo/*.h
57 60
 
58 61
 %changelog
62
+* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 1.7.15-1
63
+- Updated version and split devel package.
59 64
 * Tue Dec 30 2014 Priyesh Padmavilasom <ppadmavilasom@vmware.com>
60 65
 - initial specfile.
61 66
 
... ...
@@ -1,25 +1,34 @@
1 1
 Summary:	Git for operating system binaries
2 2
 Name:		ostree
3
-Version:	2015.3
3
+Version:	2015.7
4 4
 Release:	1%{?dist}
5
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.xz
5
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz
6 6
 Source1:	91-ostree.preset
7
-Patch0:		ostree_syntax_error_fix.patch
7
+#Patch0:		ostree_syntax_error_fix.patch
8 8
 License:	LGPLv2+
9 9
 URL:		http://live.gnome.org/OSTree
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12
+BuildRequires:	git
12 13
 BuildRequires:	which
13 14
 BuildRequires:	libgsystem
14 15
 BuildRequires:	xz-devel
15 16
 BuildRequires:	gtk-doc
16 17
 BuildRequires:	e2fsprogs-devel
17 18
 Requires:	libgsystem
19
+Requires:	gpgme
20
+Requires:	libassuan
21
+Requires:	libgpg-error
22
+Requires:       systemd
18 23
 BuildRequires:	attr
19 24
 BuildRequires:	python2-libs
20 25
 BuildRequires:	python2
21 26
 BuildRequires:	gobject-introspection
27
+BuildRequires:	gobject-introspection-devel
22 28
 BuildRequires:	gobject-introspection-python
29
+BuildRequires:  gpgme-devel
30
+BuildRequires:  libcap
31
+BuildRequires:  systemd
23 32
 
24 33
 %description
25 34
 OSTree is a tool for managing bootable, immutable, versioned
... ...
@@ -29,15 +38,28 @@ is it a tool for managing full disk images. Instead, it sits between
29 29
 those levels, offering a blend of the advantages (and disadvantages)
30 30
 of both.
31 31
 
32
+%package devel
33
+Summary: Development headers for %{name}
34
+Group: Development/Libraries
35
+Requires: %{name} = %{version}-%{release}
36
+
37
+%description devel
38
+The %{name}-devel package includes the header files for the %{name} library
39
+
32 40
 %prep
33
-%setup -q 
34
-pwd
35
-%patch0 -p0
41
+%autosetup -Sgit -n %{name}-%{version}
42
+git clone git://git.gnome.org/libglnx libglnx
43
+git clone https://github.com/mendsley/bsdiff bsdiff
44
+
45
+#pwd
46
+#%patch0 -p0
36 47
 %build
37 48
 env NOCONFIGURE=1 ./autogen.sh
38 49
 %configure \
39 50
 	--disable-silent-rules \
40 51
 	--enable-gtk-doc \
52
+	--with-dracut \
53
+	--with-mkinitcpio \
41 54
 	--prefix=%{_prefix}
42 55
 	  
43 56
 make %{?_smp_mflags}
... ...
@@ -45,7 +67,10 @@ make %{?_smp_mflags}
45 45
 %install
46 46
 make install DESTDIR=%{buildroot} INSTALL="install -p -c"
47 47
 find %{buildroot} -name '*.la' -delete
48
-install -D -m 0644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system-preset/91-ostree.preset
48
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/91-ostree.preset
49
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/
50
+cp -R %{buildroot}/lib/systemd/system/*.service %{buildroot}%{_prefix}/lib/systemd/system/
51
+rm -rf %{buildroot}/lib
49 52
 
50 53
 %clean
51 54
 rm -rf %{buildroot}
... ...
@@ -60,16 +85,31 @@ rm -rf %{buildroot}
60 60
 %doc COPYING README.md
61 61
 %{_bindir}/ostree
62 62
 %{_libdir}/*.so.1*
63
-%{_mandir}/man1/*.gz
63
+%{_sbindir}/*
64
+%{_mandir}/man*/*.gz
64 65
 %{_prefix}/lib/systemd/system-preset/91-ostree.preset
65
-%dir %{_datadir}/gtk-doc/html/ostree
66
+%{_prefix}/lib/systemd/system/ostree*.service
67
+%dir %{_prefix}/lib/dracut/modules.d/*ostree
68
+%{_prefix}/lib/dracut/modules.d/98ostree/*
69
+%{_sysconfdir}/grub.d/*ostree
70
+%{_sysconfdir}/dracut.conf.d/ostree.conf
71
+%{_sysconfdir}/ostree-mkinitcpio.conf
72
+%{_libdir}/girepository-*/OSTree-*.typelib
73
+%{_libexecdir}/ostree/grub2*
74
+%{_libdir}/initcpio/*
66 75
 %{_libdir}/lib*.so
76
+%dir %{_datadir}/gtk-doc/html/ostree
77
+
78
+%files devel
67 79
 %{_includedir}/*
68 80
 %{_libdir}/pkgconfig/*
69
-%{_sysconfdir}/grub.d/*ostree
70
-%{_libexecdir}/ostree/grub2*
71 81
 %{_datadir}/gtk-doc/html/ostree/*
82
+%{_datadir}/ostree/*
83
+%{_datadir}/gir-1.0/OSTree-1.0.gir
84
+
72 85
 %changelog
86
+*	Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1
87
+-	Updated the version
73 88
 *	Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 2014.11-1
74 89
 -	Initial build. First version
75 90
 
... ...
@@ -17,7 +17,7 @@ BuildRequires:	autoconf automake libtool
17 17
 # For docs
18 18
 BuildRequires: 	gtk-doc
19 19
 # BuildRequires: gnome-common
20
-BuildRequires: 	ostree
20
+BuildRequires: 	ostree-devel
21 21
 BuildRequires: 	libgsystem
22 22
 BuildRequires: 	json-glib-devel
23 23
 BuildRequires:	which
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        Commit RPMs to an OSTree repository
2 2
 Name:           rpm-ostree
3
-Version:        2015.3
3
+Version:        2015.7
4 4
 Release:        1%{?dist}
5 5
 Source0:        rpm-ostree-%{version}.tar.gz
6 6
 License:        LGPLv2+
... ...
@@ -8,44 +8,80 @@ URL:            https://github.com/cgwalters/rpm-ostree
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 # We always run autogen.sh
11
-BuildRequires: autoconf automake libtool
11
+BuildRequires: autoconf
12
+BuildRequires: automake
13
+BuildRequires: libtool
14
+BuildRequires: git
12 15
 BuildRequires: json-glib-devel
16
+BuildRequires: gtk-doc
13 17
 BuildRequires: libcap
14
-BuildRequires: ostree
18
+BuildRequires: ostree-devel
15 19
 BuildRequires: libgsystem
16
-BuildRequires: rpm-devel
17
-BuildRequires: hawkey-devel
18 20
 BuildRequires: docbook-xsl
19 21
 BuildRequires:	libxslt
20 22
 BuildRequires:	gobject-introspection-devel
23
+BuildRequires:	openssl-devel
24
+BuildRequires:	libhif-devel >= 0.2.0
25
+BuildRequires: 	hawkey-devel >= 0.4.6
26
+BuildRequires: 	rpm-devel >= 4.11.0
27
+BuildRequires: 	librepo-devel >= 1.7.11
28
+BuildRequires:	attr
29
+BuildRequires: 	python2-libs
30
+BuildRequires:	python2
31
+BuildRequires: 	gobject-introspection-python
32
+
21 33
 Requires:      yum
22 34
 BuildRequires:	which
23 35
 BuildRequires:	popt-devel
24 36
 Requires:	libcap
37
+Requires:	librepo-devel
25 38
 Requires:	hawkey
39
+Requires:	rpm
40
+Requires:	libhif-devel
41
+Requires:	openssl-devel
26 42
 Requires:	ostree
27 43
 Requires:	json-glib
28 44
 
29 45
 
30
-
31 46
 %description
32 47
 This tool takes a set of packages, and commits them to an OSTree
33 48
 repository.  At the moment, it is intended for use on build servers.
34 49
 
50
+%package devel
51
+Summary: Development headers for rpm-ostree
52
+Group: Development/Libraries
53
+Requires: %{name} = %{version}-%{release}
54
+
55
+%description devel
56
+Includes the header files for the rpm-ostree library.
57
+
35 58
 %prep
36
-%setup -q -n %{name}-%{version}
59
+%autosetup -Sgit -n %{name}-%{version}
60
+git clone git://git.gnome.org/libglnx libglnx
37 61
 
38 62
 %build
39 63
 env NOCONFIGURE=1 ./autogen.sh
40
-%configure --disable-silent-rules --enable-patched-hawkey-and-libsolv --enable-usrbinatomic
64
+%configure --disable-silent-rules --enable-usrbinatomic
41 65
 make %{?_smp_mflags}
42 66
 
43 67
 %install
44
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
68
+make install DESTDIR=%{buildroot} INSTALL="install -p -c"
69
+find %{buildroot} -name '*.la' -delete
45 70
 
46 71
 %files
47
-%doc COPYING README.md
48
-%{_bindir}/atomic
49 72
 %{_bindir}/rpm-ostree
73
+%{_bindir}/atomic
50 74
 %{_libdir}/%{name}/
51
-%{_mandir}/man1/*
75
+%{_mandir}/man*/*.gz
76
+%{_libdir}/*.so.1*
77
+%{_libdir}/girepository-1.0/*.typelib
78
+
79
+%files devel
80
+%{_libdir}/lib*.so
81
+%{_includedir}/*
82
+%{_libdir}/pkgconfig/*
83
+%{_datadir}/gir-1.0/*-1.0.gir
84
+
85
+%changelog
86
+*	Thu Jun 18 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1
87
+-	Added new version of rpm-ostree
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Package manager
2 2
 Name:		rpm
3 3
 Version:	4.11.2
4
-Release:	3%{?dist}
4
+Release:	4%{?dist}
5 5
 License:	GPLv2+
6 6
 URL:		http://rpm.org
7 7
 Group:		Applications/System
... ...
@@ -28,6 +28,7 @@ RPM package manager
28 28
 %package devel
29 29
 Requires:   python2
30 30
 Summary:    Libraries and header files for rpm
31
+Provides:   pkgconfig(rpm)
31 32
 
32 33
 %description devel
33 34
 Static libraries and header files for the support library for rpm
... ...
@@ -107,6 +108,8 @@ rm -rf %{buildroot}
107 107
 %{_libdir}/librpm.so
108 108
 
109 109
 %changelog
110
+*	Thu Jun 18 2015 Anish Swaminathan <anishs@vmware.com> 4.11.2-4
111
+-	Add pkgconfig Provides directive
110 112
 *	Thu Jun 18 2015 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-3
111 113
 -	Do no strip debug info from .debug files
112 114
 *	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.11.2-2
... ...
@@ -19,7 +19,9 @@ BuildRequires:	popt-devel
19 19
 BuildRequires:	rpm-devel
20 20
 BuildRequires:	glib-devel
21 21
 BuildRequires:	hawkey-devel
22
-BuildRequires:	librepo
22
+BuildRequires:	openssl-devel
23
+
24
+BuildRequires:	librepo-devel
23 25
 Source0:	%{name}-%{version}.tar.gz
24 26
 
25 27
 %description
... ...
@@ -61,7 +61,7 @@
61 61
                 "cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 
62 62
                 "nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", 
63 63
                 "libarchive", "libsoup", "asciidoc", "mkinitcpio",
64
-                "ostree", "tdnf-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",
64
+                "ostree", "tdnf-devel", "libhif", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",
65 65
                 "rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper",
66 66
                 "acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel",
67 67
                 "device-mapper-event-libs","libacl","libacl-devel","libselinux-devel","libselinux-python","libselinux-utils","libsepol-devel",
... ...
@@ -62,7 +62,7 @@
62 62
                 "Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "which", "less",  
63 63
                 "cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 
64 64
                 "nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", 
65
-                "ostree", "tdnf-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",
65
+                "ostree", "tdnf-devel", "libhif", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",
66 66
                 "rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper",
67 67
                 "acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel",
68 68
                 "device-mapper-event-libs","libacl","libacl-devel","libselinux-devel","libselinux-python","libselinux-utils","libsepol-devel",