Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f6a7b3dbde | ||
|
6bfd7bcbf6 | ||
| d17d46333c | |||
| 2908b50d27 | |||
| e8e734479f | |||
| 085e8b2679 | |||
| 6fe83ec82b | |||
|
546f01b8c2 |
8 changed files with 51 additions and 105 deletions
|
|
@ -1 +0,0 @@
|
|||
ustr-1.0.1.tar.gz
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
ustr-1.0.4.tar.gz
|
||||
21
Makefile
21
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)
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
--- Documentation/index.html 2007-08-04 01:21:02.000000000 -0400
|
||||
+++ Documentation/index.html 2007-08-04 01:43:27.000000000 -0400
|
||||
@@ -39,7 +39,7 @@
|
||||
<body>
|
||||
<h1>Micro String API - for C</h1>
|
||||
|
||||
-<h2> Download </h2>
|
||||
+<h2> Download - Version 1.0.1 </h2>
|
||||
|
||||
<p> You can get the stable release of <A href="1.0.1">1.0.x here</A>, it still
|
||||
doesn't have 100% documentation but it's pretty close. You can get the current
|
||||
@@ -693,8 +693,8 @@
|
||||
|
||||
ustr_free(s2); <span class="comment">/* free'd one reference to the data pointed to by both s2 and s3 */</span>
|
||||
|
||||
-ustr_set_share(s2); <span class="comment">/* Make s2/s3 "shared" data,
|
||||
- so it always has infinite references */</span>
|
||||
+ustr_setf_share(s2); <span class="comment">/* Make s2/s3 "shared" data,
|
||||
+ so it always has infinite references */</span>
|
||||
|
||||
if (ustr_shared(s2)) <span class="comment">/* This is TRUE */</span>
|
||||
<span class="comment">/* whatever */</span> ;
|
||||
@@ -718,8 +718,8 @@
|
||||
hence the explicit first check */</span>
|
||||
<span class="comment">/* error */</span> ;
|
||||
|
||||
-ustr_set_owner(s2); <span class="comment">/* Make s2 be "non-shared" and have a single owner */</span>
|
||||
-ustr_set_owner(s1); <span class="comment">/* This fails, as you can't make a read-only string be "non-shared" */</span>
|
||||
+ustr_setf_owner(s2); <span class="comment">/* Make s2 be "non-shared" and have a single owner */</span>
|
||||
+ustr_setf_owner(s1); <span class="comment">/* This fails, as you can't make a read-only string be "non-shared" */</span>
|
||||
|
||||
ustr_sc_del(&s2); <span class="comment">/* free'd s2 and set s2 = USTR("") */</span>
|
||||
|
||||
@@ -742,7 +742,7 @@
|
||||
<address><a href="mailto:james-web@and.org">James Antill</a></address>
|
||||
<!-- Created: Thu May 10 02:10:59 EDT 2007 -->
|
||||
<!-- hhmts start -->
|
||||
-Last modified: Sat Aug 4 01:21:02 EDT 2007
|
||||
+Last modified: Sat Aug 4 01:43:27 EDT 2007
|
||||
<!-- hhmts end -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/ustr-import.in b/ustr-import.in
|
||||
index cdc0ab0..54acb7d 100644
|
||||
--- a/ustr-import.in
|
||||
+++ b/ustr-import.in
|
||||
@@ -255,7 +255,7 @@ if $pool; then
|
||||
fi
|
||||
|
||||
if $repl; then
|
||||
- copy repl
|
||||
+ copy replace
|
||||
fi
|
||||
|
||||
if $sc; then
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 53edefe..6232cf2 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -72,6 +72,7 @@ MAN_PAGES_3 = \
|
||||
Documentation/ustr_const.3
|
||||
|
||||
EXAMPLES = examples/Makefile \
|
||||
+ examples/fgrep.c \
|
||||
examples/hello_world.c \
|
||||
examples/hexdump.c \
|
||||
examples/mkdir_p.c \
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
5f855b3ebb8dd4da40f94952efa6c6d5 ustr-1.0.1.tar.gz
|
||||
0833c29554eea19f2660aa000ba4c7b0 ustr-1.0.4.tar.gz
|
||||
|
|
|
|||
64
ustr.spec
64
ustr.spec
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
%define show_all_cmds 1
|
||||
%define broken_fed_dbg_opts 1
|
||||
%define broken_fed_dbg_opts 0
|
||||
%define multilib_inst 1
|
||||
|
||||
%if %{show_all_cmds}
|
||||
%define policy_cflags_hide HIDE=
|
||||
|
|
@ -17,17 +18,22 @@
|
|||
|
||||
%define policy_cflags %{policy_cflags_hide} %{policy_cflags_broken}
|
||||
|
||||
%if %{multilib_inst}
|
||||
%define ustr_make_install install-multilib-linux
|
||||
%else
|
||||
%define ustr_make_install install
|
||||
%endif
|
||||
|
||||
|
||||
Name: ustr
|
||||
Version: 1.0.1
|
||||
Version: 1.0.4
|
||||
Release: 6%{?dist}
|
||||
Summary: String library, very low memory overhead, simple to import
|
||||
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.gz
|
||||
Patch0: inst_examples.patch
|
||||
Patch1: html_doc_fixes.patch
|
||||
Patch2: import_repl.patch
|
||||
# Patch0: multilib-ustr-import.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# BuildRequires: make gcc sed
|
||||
|
||||
|
|
@ -80,25 +86,22 @@ Requires: %{name}-debug = %{version}-%{release}
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
#patch0 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
|
||||
|
||||
%check
|
||||
%if %{?chk}%{!?chk:1}
|
||||
make check %{policy_cflags}
|
||||
make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make $@ install prefix=%{_prefix} \
|
||||
make $@ %{ustr_make_install} prefix=%{_prefix} \
|
||||
bindir=%{_bindir} mandir=%{_mandir} \
|
||||
datadir=%{_datadir} libdir=%{_libdir} \
|
||||
includedir=%{_includedir} \
|
||||
includedir=%{_includedir} libexecdir=%{_libexecdir} \
|
||||
DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE=
|
||||
|
||||
%clean
|
||||
|
|
@ -121,9 +124,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%defattr(-,root,root,-)
|
||||
%{_datadir}/ustr-%{version}
|
||||
%{_bindir}/ustr-import
|
||||
%if %{multilib_inst}
|
||||
%{_libexecdir}/ustr-%{version}
|
||||
%endif
|
||||
%{_includedir}/ustr.h
|
||||
%{_includedir}/ustr-*.h
|
||||
%exclude %{_includedir}/ustr*debug.h
|
||||
%exclude %{_includedir}/ustr*debug*.h
|
||||
%{_libdir}/pkgconfig/ustr.pc
|
||||
%{_libdir}/libustr.so
|
||||
%{_datadir}/doc/ustr-devel-%{version}
|
||||
|
|
@ -137,8 +143,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libustr-debug-1.0.so.*
|
||||
%{_libdir}/libustr-debug.so
|
||||
%{_includedir}/ustr-debug.h
|
||||
%{_includedir}/ustr-conf-debug.h
|
||||
%{_includedir}/ustr*debug*.h
|
||||
%{_libdir}/pkgconfig/ustr-debug.pc
|
||||
|
||||
%files debug-static
|
||||
|
|
@ -146,6 +151,35 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Mar 9 2008 James Antill <james@fedoraproject.org> - 1.0.4-6
|
||||
- Fix missing multilib. dir. ownership
|
||||
- Resolves: rhbz#436711
|
||||
|
||||
* Wed Mar 5 2008 James Antill <james@fedoraproject.org> - 1.0.4-5
|
||||
- New new upstream: 1.0.4
|
||||
|
||||
* Thu Feb 21 2008 Dennis Gilmore <dennis@ausil.us> - 1.0.3-5
|
||||
- set broken_fed_dbg_opts to 0 its the recomended option upstream
|
||||
- this works around sparc GCC problems
|
||||
- add smpflags and cflags to make check
|
||||
|
||||
* Wed Feb 13 2008 James Antill <james@fedoraproject.org> - 1.0.3-4
|
||||
- Preserve timestamps for shared multilib. files.
|
||||
- Relates: bug#343351
|
||||
|
||||
* Sun Feb 10 2008 James Antill <james@fedoraproject.org> - 1.0.3-3
|
||||
- Add upstream multilib patch for ustr-import
|
||||
- Resolves: bug#343351
|
||||
|
||||
* Mon Jan 14 2008 James Antill <james@fedoraproject.org> - 1.0.3-2
|
||||
- Build new upstream in Fedora
|
||||
|
||||
* Tue Oct 30 2007 James Antill <james@and.org> - 1.0.2-2
|
||||
- Build new upstream in Fedora
|
||||
|
||||
* Mon Oct 29 2007 James Antill <james@and.org> - 1.0.2-1
|
||||
- New release
|
||||
|
||||
* Tue Aug 28 2007 James Antill <jantill@redhat.com> - 1.0.1-6
|
||||
- Add options for fedora policy brokeness, so it's easy to undo.
|
||||
- Rebuild for buildid.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue