rpms/libtxc_dxtn/devel .cvsignore, 1.2, 1.3 libtxc_dxtn.spec, 1.1, 1.2 sources, 1.2, 1.3

[Hicham HAOUARI]

Author: hicham

Update of /cvs/free/rpms/libtxc_dxtn/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6126/devel

Modified Files:
	.cvsignore libtxc_dxtn.spec sources 
Log Message:
Update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libtxc_dxtn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2010 16:59:58 -0000	1.2
+++ .cvsignore	22 Mar 2011 01:03:53 -0000	1.3
@@ -1 +1 @@
-libtxc_dxtn070518.tar.gz
+libtxc_dxtn-1.0.0.tar.bz2


Index: libtxc_dxtn.spec
===================================================================
RCS file: /cvs/free/rpms/libtxc_dxtn/devel/libtxc_dxtn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtxc_dxtn.spec	15 Dec 2010 16:59:58 -0000	1.1
+++ libtxc_dxtn.spec	22 Mar 2011 01:03:54 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           libtxc_dxtn
-Version:        070518
+Version:        1.0.0
 Release:        1%{?dist}
+Epoch:          1
 Summary:        Free implementation of the s3tc texture compression algorithm
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://people.freedesktop.org/~cbrill/libtxc_dxtn
-Source0:        http://people.freedesktop.org/~cbrill/%{name}/%{name}%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://cgit.freedesktop.org/~mareko/libtxc_dxtn/
+Source0:        http://cgit.freedesktop.org/~mareko/%{name}/snapshot/%{name}-%{version}.tar.bz2
 
 BuildRequires:  mesa-libGL-devel       
 
@@ -16,28 +16,27 @@
 
 
 %prep
-%setup -q -n %{name}
-sed -i -e 's|/usr/lib|%{_libdir}|g' Makefile
+%setup -q
+sed -i -e 's|/usr/lib|%{_libdir}|g;s|install -m|install -pm|g' Makefile
 sed -i -e 's|pixerrorcolorbest\[3\]|pixerrorcolorbest[3]={0,0,0}|g' txc_compress_dxtn.c
+sed -i -e 's|GLshort alphatest\[2\]|GLshort alphatest[2]={0,0}|g' txc_compress_dxtn.c
 
 %build
-make %{?_smp_mflags} OPT_CFLAGS="%{optflags}"
+make %{?_smp_mflags} OPT_CFLAGS="%{optflags} -Werror"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc Changelog
 %{_libdir}/*.so
 
 %changelog
+* Tue Mar 22 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:1.0.0-1
+- Update to 1.0.0 from Marek's branch
+
 * Tue Oct 26 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 070518-1
 - Initial package for Fedora.


Index: sources
===================================================================
RCS file: /cvs/free/rpms/libtxc_dxtn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2010 16:59:58 -0000	1.2
+++ sources	22 Mar 2011 01:03:54 -0000	1.3
@@ -1 +1 @@
-03beb907c13df6484cde210ce219f4b8  libtxc_dxtn070518.tar.gz
+ebee75ed669f6011e3998ba0c358d778  libtxc_dxtn-1.0.0.tar.bz2