rpms/libnoise/F-12 import.log, NONE, 1.1 libnoise-make.patch, NONE, 1.1 libnoise.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Robin Norwood]

Author: rnorwood

Update of /cvs/pkgs/rpms/libnoise/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6859/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnoise-make.patch libnoise.spec 
Log Message:
f-12 branch



--- NEW FILE import.log ---
libnoise-1_0_0-5_fc12:F-12:libnoise-1.0.0-5.fc12.src.rpm:1275004671

libnoise-make.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libnoise-make.patch ---
--- src/Makefile	2004-10-24 21:21:12.000000000 -0500
+++ src/Makefile.new	2010-05-22 01:42:31.085510085 -0500
@@ -17,7 +17,7 @@
 
 # Real build targets
 libnoise.so.0.3: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -Xcompiler -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
 
 libnoise.a: $(OBJECTS)
 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
@@ -46,7 +46,7 @@
 
 # C and C++ libtool (rather than raw CXX/CC) use
 %.o %.lo: %.cpp
-	$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $(@:.lo=.o)
+	$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) -c $< -o $(@:.lo=.o)
 
 %.o %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $(@:.lo=.o)


--- NEW FILE libnoise.spec ---
Name:           libnoise
Version:        1.0.0
Release:        5%{?dist}
Summary:        A general-purpose library that generates three-dimensional coherent noise

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://libnoise.sourceforge.net/
Source0:        http://download.sourceforge.net/libnoise/libnoisesrc-%{version}.zip
Patch0:         libnoise-make.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool
BuildRequires:  doxygen


%description
libnoise is a portable C++ library that is used to generate coherent
noise, a type of smoothly-changing noise. libnoise can generate Perlin
noise, ridged multifractal noise, and other types of coherent-noise.

Coherent noise is often used by graphics programmers to generate
natural-looking textures, planetary terrain, and other things.


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


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    doc
The %{name}-doc package contains documentation for developing
applications that use %{name}.


%prep
%setup -q -c -n noise

# The contents of the upstream zip file are a file called COPYING.txt
# and a directory called 'noise' with the source.  We don't want to
# pollute the buildroot, so everything goes in a subdirectory and we
# cd into the noise directory to build and install.

cd noise
%patch0 -p0


%build
cd noise/src

# The makefile seems somewhat broken.  If 'make' is run in the root
# directory first, libnoise.a isn't generated.

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

cd ..
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

sed -i 's/\r//' COPYING.txt

cd noise

# make install does not work.

mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/noise
cp doc/htmldata/*png doc/html
cp doc/htmldata/*css doc/html

sed -i 's/\r//' doc/html/doxygen.css

rm include/Makefile

mkdir -p $RPM_BUILD_ROOT/%{_includedir}/noise/
cp -R include/* $RPM_BUILD_ROOT/%{_includedir}/noise/

mkdir -p $RPM_BUILD_ROOT/%{_libdir}
cp lib/libnoise.so.0.3 $RPM_BUILD_ROOT/%{_libdir}

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
ln -sf libnoise.so.0.3 $RPM_BUILD_ROOT/%{_libdir}/libnoise.so.0.3.0
ln -sf libnoise.so.0.3 $RPM_BUILD_ROOT/%{_libdir}/libnoise.so
ln -sf libnoise.so.0.3 $RPM_BUILD_ROOT/%{_libdir}/libnoise.so.0


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/noise/
%{_libdir}/*.so


%files doc
%defattr(-,root,root,-)
%doc noise/doc/html


%changelog
* Thu May 27 2010 - Robin Norwood <robin.norwood at gmail.com> - 1.0.0-5
- Clean out the build root first thing during install

* Tue May 25 2010 - Robin Norwood <robin.norwood at gmail.com> - 1.0.0-4
- Remove -bestest patch
- Remove 'Public Domain' from license tag

* Mon May 24 2010 - Robin Norwood <robin.norwood at gmail.com> - 1.0.0-3
- More package review changes:
-   Split docs into -doc package
-   Fix download URL
-   Fix license tag

* Sun May 23 2010 - Robin Norwood <robin.norwood at gmail.com> - 1.0.0-2
- Suggestions from package review:
-   Fix license tag
-   Add libtool dep
-   Fix docs

* Fri May 21 2010 - Robin Norwood <robin.norwood at gmail.com> - 1.0.0-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnoise/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 May 2010 22:49:54 -0000	1.1
+++ .cvsignore	27 May 2010 23:58:06 -0000	1.2
@@ -0,0 +1 @@
+libnoisesrc-1.0.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnoise/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 May 2010 22:49:55 -0000	1.1
+++ sources	27 May 2010 23:58:06 -0000	1.2
@@ -0,0 +1 @@
+fc0d9b4f6477397568c3a9d5294b3b8c  libnoisesrc-1.0.0.zip