Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.cvsignore

@@ -1 +0,0 @@
-ustr-1.0.4.tar.gz

.gitignore

@@ -0,0 +1 @@
+ustr-1.0.4.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ustr
-# $Id$
-NAME := ustr
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-0833c29554eea19f2660aa000ba4c7b0  ustr-1.0.4.tar.gz
+93147d9f0c9765d4cd0f04f7e44bdfce  ustr-1.0.4.tar.bz2

ustr.spec

@@ -27,16 +27,17 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 8%{?dist}
+Release: 44%{?dist}
 Summary: String library, very low memory overhead, simple to import
-Group: System Environment/Libraries
-License: MIT or LGPLv2+ or BSD
+# 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
 URL: http://www.and.org/ustr/
-Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz
+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
@@ -45,7 +46,6 @@ 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,7 +58,6 @@ 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
@@ -66,7 +65,6 @@ 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}
@@ -78,7 +76,6 @@ 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
@@ -86,14 +83,16 @@ Requires: %{name}-debug = %{version}-%{release}
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
 
 %build
-make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
+make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}  -fgnu89-inline" \
+  LDFLAGS="$RPM_LD_FLAGS" %{policy_cflags}
 
 %check
 %if %{?chk}%{!?chk:1}
-make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
+make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}  -fgnu89-inline"
+  LDFLAGS="$RPM_LD_FLAGS" %{policy_cflags}
 %endif
 
 %install
@@ -102,26 +101,20 @@ 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=
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%ldconfig_scriptlets
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post debug -p /sbin/ldconfig
-
-%postun debug -p /sbin/ldconfig
+%ldconfig_scriptlets debug
 
 %files
-%defattr(-,root,root,-)
 %{_libdir}/libustr-1.0.so.*
-%doc ChangeLog LICENSE* README NEWS
+%{!?_licensedir:%global license %%doc}
+%license LICENSE*
+%doc ChangeLog README NEWS
 
 %files devel
-%defattr(-,root,root,-)
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
 %if %{multilib_inst}
@@ -132,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_includedir}/ustr*debug*.h
 %{_libdir}/pkgconfig/ustr.pc
 %{_libdir}/libustr.so
-%{_datadir}/doc/ustr-devel-%{version}
+%{_datadir}/doc/ustr-devel
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
@@ -140,7 +133,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libustr.a
 
 %files debug
-%defattr(-,root,root,-)
 %{_libdir}/libustr-debug-1.0.so.*
 %{_libdir}/libustr-debug.so
 %{_includedir}/ustr*debug*.h
@@ -151,6 +143,115 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Oct 30 2015 James Antill <james@fedoraproject.org> - 1.0.4-20
+- Move doc/ustr-devel-<version> to doc/ustr-devel. BZ 993940.
+- Use -fgnu89-inline workaround for gcc5.
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Aug  6 2014 Tom Callaway <spot@fedoraproject.org> - 1.0.4-17
+- fix license handling
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Aug 11 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.0.4-10
+- Use bzipped upstream tarball.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild