rpms/toped/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 toped.spec, 1.5, 1.6 toped.desktop, 1.3, NONE toped_32x32.png, 1.1, NONE toped_64x64.png, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sun Apr 29 19:53:08 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23901/devel
Modified Files:
.cvsignore sources toped.spec
Removed Files:
toped.desktop toped_32x32.png toped_64x64.png
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Oct 2006 17:32:46 -0000 1.2
+++ .cvsignore 29 Apr 2007 19:52:32 -0000 1.3
@@ -1 +1 @@
-toped-0.8.2.tar.bz2
+toped-0.8.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Oct 2006 17:32:46 -0000 1.2
+++ sources 29 Apr 2007 19:52:32 -0000 1.3
@@ -1 +1 @@
-31f6711a9b76f785a91a70167b0c6fab toped-0.8.2.tar.bz2
+b7ee6aae1ec996b8553ec19475b543ee toped-0.8.5.tar.bz2
Index: toped.spec
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/toped.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- toped.spec 26 Feb 2007 22:46:07 -0000 1.5
+++ toped.spec 29 Apr 2007 19:52:32 -0000 1.6
@@ -1,6 +1,6 @@
Name: toped
-Version: 0.8.2
-Release: 8%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
Summary: IC Layout Editor
License: GPL
@@ -11,15 +11,13 @@
Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source1: %{name}.desktop
-Source2: toped_32x32.png
-Source3: toped_64x64.png
-
-#Patch0: toped-0.8-h.patch
-#Patch1: toped-0.8-cpp.patch
-
-BuildRequires: freeglut-devel compat-wxGTK26-devel desktop-file-utils
+BuildRequires: desktop-file-utils
+%if "%{?fedora}" > "6"
+BuildRequires: compat-wxGTK26-devel
+%else
+BuildRequires: wxGTK-devel
+%endif
%description
Toped is an open source cross-platform IC layout editor,
@@ -28,12 +26,18 @@
%prep
%setup -q
+# instead of exporting the variable $TPD_GLOBAL
+sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
+sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
+
%build
%configure \
--with-gtk \
--with-opengl \
+%if "%{?fedora}" > "6"
--with-wx-config=%{_bindir}/wx-2.6-config \
+%endif
--enable-threads
%{__make} %{?_smp_mflags}
@@ -47,12 +51,21 @@
desktop-file-install --vendor "" \
--add-category "Engineering" \
--dir %{buildroot}%{_datadir}/applications/ \
- %{SOURCE1}
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
+%{__cp} -p ui/%{name}_16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/toped.png
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/toped.png
+%{__cp} -p ui/%{name}_32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/toped.png
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
-%{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png
+%{__cp} -p ui/%{name}_64x64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png
+
+#%{__mkdir} -p %{buildroot}%{_datadir}/fonts/%{name}/
+#%{__cp} -p %{buildroot}%{_datadir}/%{name}/fonts/* %{buildroot}%{_datadir}/fonts/%{name}/
+
+# removing duplicates
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/icons/
+#%{__rm} -rf %{buildroot}%{_datadir}/%{name}/fonts
#No translations
#%find_lang %{name}
@@ -74,16 +87,22 @@
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS TODO
+%doc AUTHORS COPYING NEWS TODO
%{_bindir}/%{name}
-%{_libdir}/libtpd*.so.0*
-%{_datadir}/tll/
+%{_libdir}/libtpd*.so*
+%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/toped.png
+#%{_datadir}/fonts/%{name}/
+
%Changelog
+* Sat Mar 10 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.5-1
+- New upstream release
+
* Mon Feb 26 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-8
- fixed for rawhide compat-wxGTK26
--- toped.desktop DELETED ---
More information about the scm-commits
mailing list