Browse Source

Fix dist-bz2 target to include .pro file.
Update RPM specfile and INSTALL instructions.


git-svn-id: file:///var/svn/tigccpp/trunk@1056 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
c9a795036b
3 changed files with 28 additions and 23 deletions
  1. 15 15
      ktigcc/INSTALL
  2. 12 7
      ktigcc/fedora/ktigcc.spec
  3. 1 1
      ktigcc/ktigcc.pro

+ 15 - 15
ktigcc/INSTALL

@@ -11,15 +11,16 @@ WARNING: This section is ONLY for Fedora Core 6 (and possibly later versions,
 1. Obtain the required prerequisites:
    1.1. The following RPMs from Fedora Core or Extras are required:
         glib2 (used by libti*)
-        qt (NOT qt4)
-        qt-devel (for the Qt Assistant help file viewer)
-        kdelibs (obviously), version 3.5.2 or higher
-        kdebase (required for some features), version 3.5.2 or higher
-        desktop-file-utils (for update-desktop-database)
+        qt4
+        qt4-doc (for the Qt Assistant help file viewer)
         ctags (to locate C functions/prototypes)
         These can be installed with:
-        yum install glib2 qt qt-devel kdelibs desktop-file-utils ctags
+        yum install glib2 qt4 qt4-doc ctags
    1.2. The following RPMs packaged by me are required:
+        kdelibs4 (obviously) and kdebase4 (required for some features), as well
+        as kdepimlibs4 (required by kdebase4), version 3.80.3 - can be obtained
+          from http://apt.kde-redhat.org/apt/kde-redhat/fedora/6/
+          (in i386/RPMS.unstable resp. x86_64/RPMS.unstable)
         tigcc and ktigcc-completion-data - can be obtained from
           http://tigcc.ticalc.org/linux/
         libticables2, libtifiles2, libticalcs2 and libticonv - can be obtained
@@ -41,12 +42,10 @@ B. Installing KTIGCC from source
 
 1. Obtain and install the required prerequisites:
    glib2 (*)
-   Qt 3 (*) (NOT Qt 4)
-   kdelibs from KDE 3, version 3.5.2 or higher (*) (NOT KDE 4, which is not even
-                                                    alpha at the time I'm
-                                                    writing this)
-   kdebase from KDE 3 (should be the same version as kdelibs)
-   Qt 3 Assistant (often included in qt or qt-devel packages)
+   Qt 4 (*) (NOT Qt 3)
+   kdelibs from KDE 4, version 3.80.3 (*) (NOT KDE 3)
+   kdebase from KDE 4 (should be the same version as kdelibs)
+   Qt 4 Assistant (often included in qt4, qt4-doc or qt4-devel packages)
    pkg-config
    Exuberant Ctags - can be obtained from http://ctags.sourceforge.net
    libticables2 (*), libtifiles2 (*), libticalcs2 (*) and libticonv (*) - can be
@@ -76,9 +75,10 @@ B. Installing KTIGCC from source
         The tarball contains a file named "completion". This file should be
         extracted to `kde-config --expandvars --install data`/ktigcc/ (usually
         /usr/share/apps/ktigcc/).
-2. qmake
-   (You can run ./configure, but that just runs qmake.)
-   WARNING: You need Qt 3 qmake.
+2. qmake-qt4 (or qmake if that points to Qt 4 qmake)
+   (You can run ./configure, but that just runs qmake-qt4.)
+   WARNING: You need the Qt 4 version of qmake. Make sure you don't accidentally
+            run the Qt 3 one.
 3. make
 4. make install
 5. KTIGCC can now be found in your $TIGCC/bin directory.

+ 12 - 7
ktigcc/fedora/ktigcc.spec

@@ -1,25 +1,25 @@
 %define tigccdir /usr/local/tigcc
 
 Name: ktigcc
-Version: 1.07
+Version: 1.80
 Release: 1
 Vendor: TIGCC Team (http://tigcc.ticalc.org)
 Packager: Kevin Kofler <Kevin@tigcc.ticalc.org>
-Source: %{name}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 Group: Development/Tools
 License: GPL
-BuildRequires: qt-devel >= 1:3.3.0 kdelibs-devel >= 6:3.5.2 glib2-devel >= 2.10.0 libticonv-devel >= 20060723 libticables2-devel >= 20060723 libtifiles2-devel >= 20060723 libticalcs2-devel >= 20060723 desktop-file-utils >= 0.10
-Requires: kdelibs >= 6:3.5.2 kdebase >= 6:3.5.2 tigcc >= 1:0.96b07r1 ktigcc-completion-data >= 0.96b07r1 qt-devel >= 1:3.2.0 ctags
+BuildRequires: qt4-devel >= 4.2.0 kdelibs4-devel = 3.80.3 glib2-devel >= 2.10.0 libticonv-devel >= 20060723 libticables2-devel >= 20060723 libtifiles2-devel >= 20060723 libticalcs2-devel >= 20060723 desktop-file-utils >= 0.10
+Requires: kdelibs4 = 3.80.3 kdebase4 = 3.80.3 tigcc >= 1:0.96b07r1 ktigcc-completion-data >= 0.96b07r1 qt4-doc ctags
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary: KTIGCC is an IDE for TIGCC using KDE
 %description
-KTIGCC is an IDE for the TIGCC cross-toolchain on *nix/X11 platforms, using the KDE 3 libraries.
+KTIGCC is an IDE for the TIGCC cross-toolchain on *nix/X11 platforms, using the KDE 4 libraries.
 
 %prep
-%setup -n %{name}
+%setup
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS" qmake
+CXXFLAGS="$RPM_OPT_FLAGS" qmake-qt4
 make
 
 %install
@@ -114,6 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{tigccdir}/doc/ktigcc
 
 %changelog
+* Thu Mar 8 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+Bump version to 1.80.
+Update BuildRequires and Requires.
+Use versioned tarball and source directory names.
+
 * Mon Jan 29 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
 Bump version to 1.07.
 

+ 1 - 1
ktigcc/ktigcc.pro

@@ -193,7 +193,7 @@ QMAKE_LFLAGS_RELEASE = -s
 DISTFILES += $${documentation.files} INSTALL configure KTIGCC.anjuta fedora/ktigcc.spec images/*.png images/copyright.txt mingw/cross-mingw32-ktigcc.sh mingw/mkspecs/win32-cross-g++/qmake.conf mingw/mkspecs/win32-cross-g++/qplatformdefs.h
 
 distbz2.target = dist-bzip2
-distbz2.commands = $(MKDIR) .obj/ktigcc-$$VERSION && $(COPY_FILE) -p --parents $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$DISTFILES $$OBJECTS_DIR/ktigcc-$$VERSION/ && (cd $$OBJECTS_DIR && $(TAR) ktigcc-$${VERSION}.tar.bz2 -j ktigcc-$$VERSION) && $(MOVE) $$OBJECTS_DIR/ktigcc-$${VERSION}.tar.bz2 . && $(DEL_FILE) -r $$OBJECTS_DIR/ktigcc-$$VERSION
+distbz2.commands = $(MKDIR) .obj/ktigcc-$$VERSION && $(COPY_FILE) -p --parents ktigcc.pro $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$DISTFILES $$OBJECTS_DIR/ktigcc-$$VERSION/ && (cd $$OBJECTS_DIR && $(TAR) ktigcc-$${VERSION}.tar.bz2 -j ktigcc-$$VERSION) && $(MOVE) $$OBJECTS_DIR/ktigcc-$${VERSION}.tar.bz2 . && $(DEL_FILE) -r $$OBJECTS_DIR/ktigcc-$$VERSION
 rpm.target = rpm
 rpm.commands = rpmbuild -ta ktigcc-$${VERSION}.tar.bz2
 rpm.depends = distbz2