1 |
dlan 14/05/30 09:59:55 |
2 |
|
3 |
Modified: snapper-9999.ebuild ChangeLog |
4 |
snapper-0.2.2-r1.ebuild |
5 |
Log: |
6 |
fix bug #511410, thanks Dainius Masiliƫnas,holgersson; combine minor improvement suggested by @jlec |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 app-backup/snapper/snapper-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-9999.ebuild?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-9999.ebuild?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-9999.ebuild?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: snapper-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-9999.ebuild,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- snapper-9999.ebuild 22 May 2014 09:56:05 -0000 1.2 |
24 |
+++ snapper-9999.ebuild 30 May 2014 09:59:55 -0000 1.3 |
25 |
@@ -1,13 +1,13 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-9999.ebuild,v 1.2 2014/05/22 09:56:05 dlan Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-9999.ebuild,v 1.3 2014/05/30 09:59:55 dlan Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
|
33 |
EGIT_REPO_URI="git://github.com/openSUSE/snapper.git" |
34 |
AUTOTOOLS_AUTORECONF=1 |
35 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
36 |
-inherit eutils autotools-utils git-2 |
37 |
+inherit eutils autotools-utils git-r3 |
38 |
|
39 |
DESCRIPTION="Command-line program for btrfs and ext4 snapshot management" |
40 |
HOMEPAGE="http://snapper.io/" |
41 |
@@ -38,36 +38,32 @@ |
42 |
|
43 |
DOCS=( AUTHORS README package/snapper.changes ) |
44 |
|
45 |
-src_prepare() { |
46 |
- epatch "${FILESDIR}"/cron-confd.patch |
47 |
- autotools-utils_src_prepare |
48 |
-} |
49 |
+PATCHES=( "${FILESDIR}"/cron-confd.patch ) |
50 |
|
51 |
src_configure() { |
52 |
- econf \ |
53 |
- --with-conf="/etc/conf.d" \ |
54 |
- --docdir="/usr/share/doc/${PF}" \ |
55 |
- $(use_enable btrfs) \ |
56 |
- $(use_enable ext4) \ |
57 |
- $(use_enable lvm) \ |
58 |
- $(use_enable pam) \ |
59 |
- $(use_enable xattr xattrs) \ |
60 |
- --disable-zypp |
61 |
+ local myeconfargs=( |
62 |
+ --with-conf="/etc/conf.d" |
63 |
+ --docdir="/usr/share/doc/${PF}" |
64 |
+ --disable-zypp |
65 |
+ $(use_enable btrfs) |
66 |
+ $(use_enable ext4) |
67 |
+ $(use_enable lvm) |
68 |
+ $(use_enable pam) |
69 |
+ $(use_enable xattr xattrs) |
70 |
+ ) |
71 |
+ autotools-utils_src_configure |
72 |
} |
73 |
|
74 |
src_install() { |
75 |
- default |
76 |
+ autotools-utils_src_install |
77 |
# Existing configuration file required to function |
78 |
newconfd data/sysconfig.snapper snapper |
79 |
- prune_libtool_files |
80 |
} |
81 |
|
82 |
pkg_postinst() { |
83 |
- elog "In order to use Snapper, you need to set up at least one config" |
84 |
- elog "manually, or else the tool will get confused. Typically you should" |
85 |
- elog "create a '/.snapshots' directory, then copy the file" |
86 |
- elog "'/etc/snapper/config-templates/default' into '/etc/snapper/configs/'," |
87 |
- elog "rename the file to 'root', and add its name into '/etc/conf.d/snapper'." |
88 |
- elog "That will instruct Snapper to snapshot the root of the filesystem by" |
89 |
- elog "default. For more information, see the snapper(8) manual page." |
90 |
+ elog "In order to use Snapper, you need to set up" |
91 |
+ elog "at least one config first. To do this, run:" |
92 |
+ elog "snapper create-config <subvolume>" |
93 |
+ elog "For more information, see man (8) snapper or" |
94 |
+ elog "http://snapper.io/documentation.html" |
95 |
} |
96 |
|
97 |
|
98 |
|
99 |
1.3 app-backup/snapper/ChangeLog |
100 |
|
101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/ChangeLog?rev=1.3&view=markup |
102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/ChangeLog?rev=1.3&content-type=text/plain |
103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/ChangeLog?r1=1.2&r2=1.3 |
104 |
|
105 |
Index: ChangeLog |
106 |
=================================================================== |
107 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/snapper/ChangeLog,v |
108 |
retrieving revision 1.2 |
109 |
retrieving revision 1.3 |
110 |
diff -u -r1.2 -r1.3 |
111 |
--- ChangeLog 22 May 2014 09:56:05 -0000 1.2 |
112 |
+++ ChangeLog 30 May 2014 09:59:55 -0000 1.3 |
113 |
@@ -1,6 +1,11 @@ |
114 |
# ChangeLog for app-backup/snapper |
115 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
116 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/ChangeLog,v 1.2 2014/05/22 09:56:05 dlan Exp $ |
117 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/ChangeLog,v 1.3 2014/05/30 09:59:55 dlan Exp $ |
118 |
+ |
119 |
+ 30 May 2014; Yixun Lan <dlan@g.o> snapper-0.2.2-r1.ebuild, |
120 |
+ snapper-9999.ebuild: |
121 |
+ fix bug #511410, thanks Dainius Masiliƫnas,holgersson; combine minor |
122 |
+ improvement suggested by @jlec |
123 |
|
124 |
*snapper-0.2.2-r1 (22 May 2014) |
125 |
|
126 |
|
127 |
|
128 |
|
129 |
1.2 app-backup/snapper/snapper-0.2.2-r1.ebuild |
130 |
|
131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild?rev=1.2&view=markup |
132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild?rev=1.2&content-type=text/plain |
133 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild?r1=1.1&r2=1.2 |
134 |
|
135 |
Index: snapper-0.2.2-r1.ebuild |
136 |
=================================================================== |
137 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild,v |
138 |
retrieving revision 1.1 |
139 |
retrieving revision 1.2 |
140 |
diff -u -r1.1 -r1.2 |
141 |
--- snapper-0.2.2-r1.ebuild 22 May 2014 09:56:05 -0000 1.1 |
142 |
+++ snapper-0.2.2-r1.ebuild 30 May 2014 09:59:55 -0000 1.2 |
143 |
@@ -1,6 +1,6 @@ |
144 |
# Copyright 1999-2014 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild,v 1.1 2014/05/22 09:56:05 dlan Exp $ |
147 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/snapper/snapper-0.2.2-r1.ebuild,v 1.2 2014/05/30 09:59:55 dlan Exp $ |
148 |
|
149 |
EAPI=5 |
150 |
|
151 |
@@ -40,15 +40,18 @@ |
152 |
} |
153 |
|
154 |
src_configure() { |
155 |
- econf \ |
156 |
- --with-conf="/etc/conf.d" \ |
157 |
- --docdir="/usr/share/doc/${PF}" \ |
158 |
- $(use_enable btrfs) \ |
159 |
- $(use_enable ext4) \ |
160 |
- $(use_enable lvm) \ |
161 |
- $(use_enable pam) \ |
162 |
- $(use_enable xattr xattrs) \ |
163 |
- --disable-zypp |
164 |
+ local myeconfargs=( |
165 |
+ --with-conf="/etc/conf.d" |
166 |
+ --docdir="/usr/share/doc/${PF}" |
167 |
+ --disable-zypp |
168 |
+ $(use_enable btrfs) |
169 |
+ $(use_enable ext4) |
170 |
+ $(use_enable lvm) |
171 |
+ $(use_enable pam) |
172 |
+ $(use_enable xattr xattrs) |
173 |
+ ) |
174 |
+ |
175 |
+ econf "${myeconfargs[@]}" |
176 |
} |
177 |
|
178 |
src_install() { |
179 |
@@ -59,11 +62,9 @@ |
180 |
} |
181 |
|
182 |
pkg_postinst() { |
183 |
- elog "In order to use Snapper, you need to set up at least one config" |
184 |
- elog "manually, or else the tool will get confused. Typically you should" |
185 |
- elog "create a '/.snapshots' directory, then copy the file" |
186 |
- elog "'/etc/snapper/config-templates/default' into '/etc/snapper/configs/'," |
187 |
- elog "rename the file to 'root', and add its name into '/etc/conf.d/snapper'." |
188 |
- elog "That will instruct Snapper to snapshot the root of the filesystem by" |
189 |
- elog "default. For more information, see the snapper(8) manual page." |
190 |
+ elog "In order to use Snapper, you need to set up" |
191 |
+ elog "at least one config first. To do this, run:" |
192 |
+ elog "snapper create-config <subvolume>" |
193 |
+ elog "For more information, see man (8) snapper or" |
194 |
+ elog "http://snapper.io/documentation.html" |
195 |
} |