scm-commits August 2015

scm-commits@lists.fedoraproject.org

8 participants
26546 discussions

jchaloup pushed to golang-github-coreos-go-etcd (f22). "Bump to upstream 4cceaf7283b76f27c4a732b20730dcdb61053bf5 (..more)"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 975fc257a16dcdfb2c8d6e82a56de027e815e1c3 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka <jchaloup(a)redhat.com> Date: Mon, 31 Aug 2015 21:05:27 +0200 Subject: Bump to upstream 4cceaf7283b76f27c4a732b20730dcdb61053bf5 - resolves: #1246214 diff --git a/.gitignore b/.gitignore index 3661b36..ae1780e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/go-etcd-0424b5f.tar.gz +/go-etcd-4cceaf7.tar.gz diff --git a/golang-github-coreos-go-etcd.spec b/golang-github-coreos-go-etcd.spec index 13303e5..084c297 100644 --- a/golang-github-coreos-go-etcd.spec +++ b/golang-github-coreos-go-etcd.spec @@ -1,60 +1,195 @@ +%if 0%{?fedora} || 0%{?rhel} == 6 +%global with_devel 1 +%global with_bundled 0 +%global with_debug 0 +# needs etcd running +%global with_check 0 +%global with_unit_test 1 +%else +%global with_devel 0 +%global with_bundled 0 +%global with_debug 0 +%global with_check 0 +%global with_unit_test 0 +%endif + +%if 0%{?with_debug} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%define copying() \ +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \ +%license %{*} \ +%else \ +%doc %{*} \ +%endif + +%global isgccgoarch 0 +%if 0%{?gccgo_arches:1} +%ifarch %{gccgo_arches} +%global isgccgoarch 1 +%endif +%endif + %global provider github %global provider_tld com %global project coreos %global repo go-etcd -%global commit 0424b5f86ef0ca57a5309c599f74bbb3e97ecd9d - -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +# https://github.com/coreos/go-etcd +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit 4cceaf7283b76f27c4a732b20730dcdb61053bf5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global debug_package %{nil} -Name: golang-%{provider}-%{project}-%{repo} -Version: 2.0.0 -Release: 0.2.git%{shortcommit}%{?dist} -Summary: The official etcd v0.2 client library for Go -License: ASL 2.0 -URL: http://%{import_path} -Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildArch: noarch +Name: golang-%{provider}-%{project}-%{repo} +Version: 2.0.0 +Release: 0.3.git%{shortcommit}%{?dist} +Summary: Go client library for etcd +License: ASL 2.0 +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Patch0: change-default-ports.patch + +# If go_arches not defined fall through to implicit golang archs +%if 0%{?go_arches:1} +ExclusiveArch: %{go_arches} +%else +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif +# If gccgo_arches does not fit or is not defined fall through to golang +%if %{isgccgoarch} +BuildRequires: gcc-go >= %{gccgo_min_vers} %else -ExclusiveArch: %{ix86} x86_64 %{arm} +BuildRequires: golang %endif %description %{summary} +%if 0%{?with_devel} %package devel -BuildRequires: golang >= 1.2.1-3 -BuildRequires: golang(github.com/coreos/etcd/etcdserver/etcdhttp/httptypes) -Requires: golang >= 1.2.1-3 -Requires: golang(github.com/coreos/etcd/etcdserver/etcdhttp/httptypes) -Summary: A golang library for logging to systemd -Provides: golang(%{import_path}/etcd) = %{version}-%{release} +Summary: %{summary} +BuildArch: noarch + +%if 0%{?with_check} +BuildRequires: golang(github.com/ugorji/go/codec) +%endif + +Requires: golang(github.com/ugorji/go/codec) + +Provides: golang(%{import_path}/etcd) = %{version}-%{release} %description devel %{summary} -This package contains library source intended for building other packages -which use coreos/go-etcd. +This package contains library source intended for +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test +Summary: Unit tests for %{name} package +# If go_arches not defined fall through to implicit golang archs +%if 0%{?go_arches:1} +ExclusiveArch: %{go_arches} +%else +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif +# If gccgo_arches does not fit or is not defined fall through to golang +%if %{isgccgoarch} +BuildRequires: gcc-go >= %{gccgo_min_vers} +%else +BuildRequires: golang +%endif + +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%description unit-test +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif %prep %setup -q -n %{repo}-%{commit} +%patch0 -p1 %build %install -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/etcd -cp -pav etcd/*.go %{buildroot}/%{gopath}/src/%{import_path}/etcd +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test.file-list +for file in $(find . -iname "*_test.go"); do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list +done +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if %{isgccgoarch} +function gotest { %{gcc_go_test} "$@"; } +%else +%if 0%{?golang_test:1} +function gotest { %{golang_test} "$@"; } +%else +function gotest { go test "$@"; } +%endif +%endif -%files devel -%doc LICENSE README.md +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +gotest %{import_path}/etcd +%endif + +%if 0%{?with_devel} +%files devel -f devel.file-list +%copying LICENSE +%doc README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/etcd -%attr(644,-,-) %{gopath}/src/%{import_path}/etcd/*.go +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test -f unit-test.file-list +%copying LICENSE +%doc README.md +%endif %changelog +* Mon Aug 31 2015 jchaloup <jchaloup(a)redhat.com> - 2.0.0-0.3.git4cceaf7 +- Bump to upstream 4cceaf7283b76f27c4a732b20730dcdb61053bf5 + resolves: #1246214 + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.0-0.2.git0424b5f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 7d8b0e1..920eb8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a155badbae16148dd45e271b4bfbdf3c go-etcd-0424b5f.tar.gz +3f47afe72a946ca5798468ed33b898c5 go-etcd-4cceaf7.tar.gz -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/golang-github-coreos-go-etcd.git/commit/… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

jchaloup pushed to golang-github-coreos-go-etcd (f21). "Bump to upstream 4cceaf7283b76f27c4a732b20730dcdb61053bf5 (..more)"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

1 0

kalev pushed to ghex (f23). "Tighten -devel package deps with the _isa macro"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From de631a161911e69d4aba53513fea9b30ae1366bc Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:28:32 +0200 Subject: Tighten -devel package deps with the _isa macro diff --git a/ghex.spec b/ghex.spec index 8d2cb72..007e829 100644 --- a/ghex.spec +++ b/ghex.spec @@ -29,7 +29,7 @@ A useful tool for working with raw data. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -94,6 +94,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Include new symbolic icons - Use make_install macro - Mark license files with the license macro +- Tighten -devel package deps with the _isa macro * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=de631a161911e6… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (f23). "Mark license files with the license macro"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 6f4514645b29e726e6c3e4bdd7e38bc85c5f330a Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:27:27 +0200 Subject: Mark license files with the license macro diff --git a/ghex.spec b/ghex.spec index 8a4b805..8d2cb72 100644 --- a/ghex.spec +++ b/ghex.spec @@ -72,7 +72,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}-3.0.lang -%doc AUTHORS COPYING COPYING-DOCS HACKING NEWS README +%license COPYING COPYING-DOCS +%doc AUTHORS NEWS README %{_bindir}/* %{_datadir}/appdata/ghex.appdata.xml %{_datadir}/applications/ghex.desktop @@ -92,6 +93,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to 3.17.91 - Include new symbolic icons - Use make_install macro +- Mark license files with the license macro * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=6f4514645b29e7… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (f23). "Split out the shared library to -libs subpackage (..more)"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 50c225b7489403cc7b3835bf5fdf6ffbd98d0fc0 Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:34:47 +0200 Subject: Split out the shared library to -libs subpackage This makes it possible for other apps that link with gtkhex, such as Nemiver to only pull in the -libs subpackage and not the ghex app. diff --git a/ghex.spec b/ghex.spec index 007e829..2b9cb4f 100644 --- a/ghex.spec +++ b/ghex.spec @@ -19,6 +19,8 @@ BuildRequires: itstool Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + %description GHex can load raw data from binary files and display them for editing in the traditional hex editor view. The display is split in two columns, with @@ -26,10 +28,17 @@ hexadecimal values in one column and the ASCII representation in the other. A useful tool for working with raw data. +%package libs +Summary: GtkHex library + +%description libs +The %{name}-libs package contains the shared GtkHex library. + + %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -52,13 +61,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop %find_lang %{name}-3.0 --all-name --with-gnome +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %post -/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : @@ -80,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/GConf/gsettings/ghex.convert %{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml %{_datadir}/icons/hicolor/*/apps/* + +%files libs +%license COPYING %{_libdir}/*.so.* %files devel @@ -95,6 +107,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Use make_install macro - Mark license files with the license macro - Tighten -devel package deps with the _isa macro +- Split out the shared library to -libs subpackage * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=50c225b7489403… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (f23). "DOn't override the appdata screenshot (..more)"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 1f3260e0b6e0467be469530668ce02ca7f6222dc Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:25:05 +0200 Subject: DOn't override the appdata screenshot GHex has got a nice new screenshot upstream now. diff --git a/ghex.spec b/ghex.spec index 95890d4..7c59bbc 100644 --- a/ghex.spec +++ b/ghex.spec @@ -16,7 +16,6 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: itstool -BuildRequires: libappstream-glib Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -49,15 +48,6 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -# Update the screenshot shown in the software center -# -# NOTE: It would be *awesome* if this file was pushed upstream. -# -# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. -# -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/ghex.appdata.xml \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screensho… - desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop %find_lang %{name}-3.0 --all-name --with-gnome -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=1f3260e0b6e046… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (f23). "Use make_install macro"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From b83bffe19c73c85c76cd40e2a6f21d3cbee2ddea Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:26:52 +0200 Subject: Use make_install macro diff --git a/ghex.spec b/ghex.spec index 7c59bbc..8a4b805 100644 --- a/ghex.spec +++ b/ghex.spec @@ -45,7 +45,7 @@ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop @@ -91,6 +91,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Aug 31 2015 Kalev Lember <klember(a)redhat.com> - 3.17.91-1 - Update to 3.17.91 - Include new symbolic icons +- Use make_install macro * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=b83bffe19c73c8… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (f23). "Update to 3.17.91"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 6bd747ecee49b34ec965eadb36775c99586380ff Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Mon, 31 Aug 2015 23:52:07 +0200 Subject: Update to 3.17.91 diff --git a/ghex.spec b/ghex.spec index 29cc863..95890d4 100644 --- a/ghex.spec +++ b/ghex.spec @@ -2,8 +2,8 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: ghex -Version: 3.10.1 -Release: 5%{?dist} +Version: 3.17.91 +Release: 1%{?dist} Summary: Binary editor for GNOME Group: Applications/Editors @@ -66,7 +66,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop %post /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -touch --no-create %{_datadir}/icons/HighContrast &>/dev/null || : %postun /sbin/ldconfig @@ -75,15 +74,11 @@ if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - touch --no-create %{_datadir}/icons/HighContrast &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || : fi %posttrans glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || : %files -f %{name}-3.0.lang @@ -94,7 +89,6 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || : %{_datadir}/GConf/gsettings/ghex.convert %{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/icons/HighContrast/*/apps/ghex.png %{_libdir}/*.so.* %files devel @@ -104,6 +98,10 @@ gtk-update-icon-cache %{_datadir}/icons/HighContrast &>/dev/null || : %changelog +* Mon Aug 31 2015 Kalev Lember <klember(a)redhat.com> - 3.17.91-1 +- Update to 3.17.91 +- Include new symbolic icons + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 5c652e7..9665ba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcd5af85a8e127da29257c9ca6aad5ee ghex-3.10.1.tar.xz +0debd983377f0ac4cfa83f3b6b663699 ghex-3.17.91.tar.xz -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=f23&id=6bd747ecee49b3… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (master). "Split out the shared library to -libs subpackage (..more)"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From 50c225b7489403cc7b3835bf5fdf6ffbd98d0fc0 Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:34:47 +0200 Subject: Split out the shared library to -libs subpackage This makes it possible for other apps that link with gtkhex, such as Nemiver to only pull in the -libs subpackage and not the ghex app. diff --git a/ghex.spec b/ghex.spec index 007e829..2b9cb4f 100644 --- a/ghex.spec +++ b/ghex.spec @@ -19,6 +19,8 @@ BuildRequires: itstool Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + %description GHex can load raw data from binary files and display them for editing in the traditional hex editor view. The display is split in two columns, with @@ -26,10 +28,17 @@ hexadecimal values in one column and the ASCII representation in the other. A useful tool for working with raw data. +%package libs +Summary: GtkHex library + +%description libs +The %{name}-libs package contains the shared GtkHex library. + + %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -52,13 +61,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop %find_lang %{name}-3.0 --all-name --with-gnome +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %post -/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : @@ -80,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/GConf/gsettings/ghex.convert %{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml %{_datadir}/icons/hicolor/*/apps/* + +%files libs +%license COPYING %{_libdir}/*.so.* %files devel @@ -95,6 +107,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Use make_install macro - Mark license files with the license macro - Tighten -devel package deps with the _isa macro +- Split out the shared library to -libs subpackage * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=master&id=50c225b7489… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

kalev pushed to ghex (master). "Tighten -devel package deps with the _isa macro"
by notifications＠fedoraproject.org 31 Aug '15

31 Aug '15

From de631a161911e69d4aba53513fea9b30ae1366bc Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember(a)redhat.com> Date: Tue, 1 Sep 2015 00:28:32 +0200 Subject: Tighten -devel package deps with the _isa macro diff --git a/ghex.spec b/ghex.spec index 8d2cb72..007e829 100644 --- a/ghex.spec +++ b/ghex.spec @@ -29,7 +29,7 @@ A useful tool for working with raw data. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -94,6 +94,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Include new symbolic icons - Use make_install macro - Mark license files with the license macro +- Tighten -devel package deps with the _isa macro * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/ghex.git/commit/?h=master&id=de631a16191… -- scm-commits mailing list scm-commits(a)lists.fedoraproject.org http://lists.fedoraproject.org/postorius/scm-commits@lists.fedoraproject.org

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2015