diff --git a/ustr.spec b/ustr.spec index 1cfeb4c..c171350 100644 --- a/ustr.spec +++ b/ustr.spec @@ -27,17 +27,16 @@ Name: ustr Version: 1.0.4 -Release: 44%{?dist} +Release: 15%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # 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 +45,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 +58,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 +66,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 +78,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,16 +86,14 @@ Requires: %{name}-debug = %{version}-%{release} %prep %setup -q -%patch -P0 -p1 +%patch0 -p1 %build -make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags} -fgnu89-inline" \ - LDFLAGS="$RPM_LD_FLAGS" %{policy_cflags} +make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %check %if %{?chk}%{!?chk:1} -make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags} -fgnu89-inline" - LDFLAGS="$RPM_LD_FLAGS" %{policy_cflags} +make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %endif %install @@ -101,20 +102,26 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \ bindir=%{_bindir} mandir=%{_mandir} \ datadir=%{_datadir} libdir=%{_libdir} \ includedir=%{_includedir} libexecdir=%{_libexecdir} \ - DOCSHRDIR=%{_datadir}/doc/ustr-devel \ DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE= -%ldconfig_scriptlets +%clean +rm -rf $RPM_BUILD_ROOT -%ldconfig_scriptlets debug +%post -p /sbin/ldconfig + +%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 +%doc ChangeLog LICENSE* README NEWS %files devel +%defattr(-,root,root,-) %{_datadir}/ustr-%{version} %{_bindir}/ustr-import %if %{multilib_inst} @@ -125,7 +132,7 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \ %exclude %{_includedir}/ustr*debug*.h %{_libdir}/pkgconfig/ustr.pc %{_libdir}/libustr.so -%{_datadir}/doc/ustr-devel +%{_datadir}/doc/ustr-devel-%{version} %{_mandir}/man1/* %{_mandir}/man3/* @@ -133,6 +140,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,94 +151,6 @@ make $@ %{ustr_make_install} prefix=%{_prefix} \ %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.0.4-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.0.4-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.4-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.0.4-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 1.0.4-40 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.4-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.4-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.4-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.4-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.4-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.4-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.4-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.0.4-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0.4-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.0.4-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.0.4-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.0.4-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.0.4-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 23 2018 Florian Weimer - 1.0.4-26 -- Use LDFLAGS from redhat-rpm-config - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.4-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.4-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.4-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 30 2015 James Antill - 1.0.4-20 -- Move doc/ustr-devel- to doc/ustr-devel. BZ 993940. -- Use -fgnu89-inline workaround for gcc5. - -* Fri Jun 19 2015 Fedora Release Engineering - 1.0.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 6 2014 Tom Callaway - 1.0.4-17 -- fix license handling - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - * Sun Aug 04 2013 Fedora Release Engineering - 1.0.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild