null+****@clear*****
null+****@clear*****
2012年 5月 24日 (木) 11:43:51 JST
Kouhei Sutou 2012-05-24 11:43:51 +0900 (Thu, 24 May 2012)
New Revision: d880277eab70a6a72376050f8a89cbd925893209
Log:
yum: use Yum repository RPM name convention
groonga-repository -> groogna-release
Modified files:
packages/yum/Makefile.am
Renamed files:
packages/yum/build-release-rpm.sh
(from packages/yum/build-repository-rpm.sh)
packages/yum/groonga-release.spec
(from packages/yum/groonga-repository.spec)
Modified: packages/yum/Makefile.am (+3 -3)
===================================================================
--- packages/yum/Makefile.am 2012-05-23 17:11:11 +0900 (1924d89)
+++ packages/yum/Makefile.am 2012-05-24 11:43:51 +0900 (680c8a6)
@@ -33,7 +33,7 @@ download: ensure-rsync-path
$(SERVER_PATH)/$${distribution}/ $${distribution}; \
done
-build: build-in-chroot build-repository-rpm
+build: build-in-chroot build-release-rpm
build-in-chroot: source
./build-in-chroot.sh \
@@ -48,8 +48,8 @@ build-in-chroot: source
'$(USE_RPMFORGE)' \
'$(USE_ATRPMS)'
-build-repository-rpm: RPM-GPG-KEY-$(PACKAGE)
- ./build-repository-rpm.sh \
+build-release-rpm: RPM-GPG-KEY-$(PACKAGE)
+ ./build-release-rpm.sh \
$(PACKAGE) \
'$(PACKAGE_TITLE)' \
$(BASE_URL_PREFIX) \
Renamed: packages/yum/build-release-rpm.sh (+5 -5) 88%
===================================================================
--- packages/yum/build-repository-rpm.sh 2012-05-23 17:11:11 +0900 (c5a2541)
+++ packages/yum/build-release-rpm.sh 2012-05-24 11:43:51 +0900 (06f5dc0)
@@ -75,18 +75,18 @@ enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-$PACKAGE
EOR
fi
- run tar cfz $rpm_base_dir/SOURCES/${PACKAGE}-repository.tar.gz \
+ run tar cfz $rpm_base_dir/SOURCES/${PACKAGE}-release.tar.gz \
-C ${script_base_dir} ${repo} RPM-GPG-KEY-${PACKAGE}
- run cp ${script_base_dir}/${PACKAGE}-repository.spec $rpm_base_dir/SPECS/
+ run cp ${script_base_dir}/${PACKAGE}-release.spec $rpm_base_dir/SPECS/
- run rpmbuild -ba $rpm_base_dir/SPECS/${PACKAGE}-repository.spec
+ run rpmbuild -ba $rpm_base_dir/SPECS/${PACKAGE}-release.spec
top_dir=$script_base_dir/$distribution
run mkdir -p $top_dir
run cp -p \
- $rpm_base_dir/RPMS/noarch/${PACKAGE}-repository-* \
- $rpm_base_dir/SRPMS/${PACKAGE}-repository-* \
+ $rpm_base_dir/RPMS/noarch/${PACKAGE}-release-* \
+ $rpm_base_dir/SRPMS/${PACKAGE}-release-* \
${script_base_dir}/RPM-GPG-KEY-${PACKAGE} \
$top_dir
Renamed: packages/yum/groonga-release.spec (+10 -5) 73%
===================================================================
--- packages/yum/groonga-repository.spec 2012-05-23 17:11:11 +0900 (ece01c4)
+++ packages/yum/groonga-release.spec 2012-05-24 11:43:51 +0900 (5a936ea)
@@ -1,16 +1,17 @@
-Summary: groonga RPM repository configuration
-Name: groonga-repository
-Version: 1.0.1
+Summary: Groonga release files
+Name: groonga-release
+Version: 1.1.0
Release: 0
License: LGPLv2
URL: http://packages.groonga.org/
-Source: groonga-repository.tar.gz
+Source: groonga-release.tar.gz
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildArchitectures: noarch
+Obsoletes: groonga-repository < 1.1.0-0
%description
-groonga RPM repository configuration.
+Groonga release files
%prep
%setup -c
@@ -37,6 +38,10 @@ groonga RPM repository configuration.
%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga
%changelog
+* Thu May 29 2012 Kouhei Sutou <kou****@clear*****>
+- Rename to groonga-release from groonga-repository to follow
+ convention such as centos-release and fedora-release.
+
* Sun Apr 29 2012 Kouhei Sutou <kou****@clear*****>
- Update GPG key.