Use LDFLAGS from redhat-rpm-config

2018-02-23 16:09:42 +01:00
1 changed files with 17 additions and 62 deletions
--- a/ustr.spec
+++ b/ustr.spec
@ -27,17 +27,15 @@

 Name: ustr
 Version: 1.0.4
-Release: 44%{?dist}
+Release: 26%{?dist}
 Summary: String library, very low memory overhead, simple to import
-# Automatically converted from old format: MIT or LGPLv2+ or BSD - review is highly recommended.
-License: LicenseRef-Callaway-MIT OR LicenseRef-Callaway-LGPLv2+ OR LicenseRef-Callaway-BSD
+Group: System Environment/Libraries
+License: MIT or LGPLv2+ or BSD
 URL: http://www.and.org/ustr/
 Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.bz2
 Patch0: c99-inline.patch
 # BuildRequires: make gcc sed

-BuildRequires: make
-BuildRequires:  gcc
 %description
 Micro string library, very low overhead from plain strdup() (Ave. 44% for
 0-20B strings). Very easy to use in existing C code. At it's simplest you can
@ -46,6 +44,7 @@ just include a single header file into your .c and start using it.

 %package devel
 Summary: Development files for %{name}
+Group: Development/Libraries
 # This isn't required, but Fedora policy makes it so
 Requires: pkgconfig >= 0.14
 Requires: %{name} = %{version}-%{release}
@ -58,6 +57,7 @@ the code in your projects ... you don't have to link to the shared lib.

 %package static
 Summary: Static development files for %{name}
+Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}

 %description static
@ -65,6 +65,7 @@ Requires: %{name}-devel = %{version}-%{release}

 %package debug
 Summary: Development files for %{name}, with debugging options turned on
+Group: Development/Libraries
 # This isn't required, but Fedora policy makes it so
 Requires: pkgconfig >= 0.14
 Requires: %{name}-devel = %{version}-%{release}
@ -76,6 +77,7 @@ library.

 %package debug-static
 Summary: Static development files for %{name}, with debugging options turned on
+Group: Development/Libraries
 Requires: %{name}-debug = %{version}-%{release}

 %description debug-static
@ -83,7 +85,7 @@ Requires: %{name}-debug = %{version}-%{release}

 %prep
 %setup -q
-%patch -P0 -p1
+%patch0 -p1

 %build
 make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}  -fgnu89-inline" \
@ -104,17 +106,23 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \
                DOCSHRDIR=%{_datadir}/doc/ustr-devel \
                DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE=

-%ldconfig_scriptlets
+%post -p /sbin/ldconfig

-%ldconfig_scriptlets debug
+%postun -p /sbin/ldconfig
+
+%post debug -p /sbin/ldconfig
+
+%postun debug -p /sbin/ldconfig

 %files
+%defattr(-,root,root,-)
 %{_libdir}/libustr-1.0.so.*
 %{!?_licensedir:%global license %%doc}
 %license LICENSE*
 %doc ChangeLog README NEWS

 %files devel
+%defattr(-,root,root,-)
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
 %if %{multilib_inst}
@ -133,6 +141,7 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \
 %{_libdir}/libustr.a

 %files debug
+%defattr(-,root,root,-)
 %{_libdir}/libustr-debug-1.0.so.*
 %{_libdir}/libustr-debug.so
 %{_includedir}/ustr*debug*.h
@ -143,60 +152,6 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \


 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.4-40
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Feb 23 2018 Florian Weimer <fweimer@redhat.com> - 1.0.4-26
 - Use LDFLAGS from redhat-rpm-config